make the default etc/init.d/S40network compatible with msh

msh is currently the only good choice for uClinux but it doesn't understands shell functions. In this case there is nothing to gain by using shell functions anyway.

Index: target/generic/target_busybox_skeleton/etc/init.d/S40network
===================================================================
@@ -3,28 +3,18 @@
 # Start the network....
 #
 
-start() {
+case "$1" in
+  start)
  	echo "Starting network..."
 	/sbin/ifup -a
-}	
-stop() {
+	;;
+  stop)
 	echo -n "Stopping network..."
 	/sbin/ifdown -a
-}
-restart() {
-	stop
-	start
-}	
-
-case "$1" in
-  start)
-  	start
 	;;
-  stop)
-  	stop
-	;;
   restart|reload)
-  	restart
+	"$0" stop
+	"$0" start
 	;;
   *)
 	echo $"Usage: $0 {start|stop|restart}"

Index: target/generic/target_skeleton/etc/init.d/S40network
===================================================================
@@ -3,28 +3,18 @@
 # Start the network....
 #
 
-start() {
+case "$1" in
+  start)
  	echo "Starting network..."
 	/sbin/ifup -a
-}	
-stop() {
+	;;
+  stop)
 	echo -n "Stopping network..."
 	/sbin/ifdown -a
-}
-restart() {
-	stop
-	start
-}	
-
-case "$1" in
-  start)
-  	start
 	;;
-  stop)
-  	stop
-	;;
   restart|reload)
-  	restart
+	"$0" stop
+	"$0" start
 	;;
   *)
 	echo $"Usage: $0 {start|stop|restart}"

Nicolas> msh is currently the only good choice for uClinux but it doesn't Nicolas> understands shell functions. In this case there is nothing to gain Nicolas> by using shell functions anyway.

Nicolas> Signed-off-by: Nicolas Pitre <[email protected]>

A lot of the other startup scripts (dbus, dropbear, hal, mdnsresponder, ..) also use functions, but I take it those aren't relevant for uclinux?

Anyway, committed as r24325.

It would btw be handy if you could create your patches with one more level, so I can apply them with git-am without having to remember to add -p 0.

Bye, Peter Korsgaard

I didn't use those, except for dropbear which startup script I modified as well (to only create the initial host keys since the dropbear server is otherwise started through inetd).

Thanks.

True indeed. I generated those patches with svn diff, and being so used to git I forgot that other systems have different defaults.

Now what about the 10 or so other patches I posted? Will they get merged? I have more patches to post but I wanted to see what was going to happen with this lot first.

Nicolas

Hi,

Nicolas> I didn't use those, except for dropbear which startup script Nicolas> I modified as well (to only create the initial host keys Nicolas> since the dropbear server is otherwise started through Nicolas> inetd).

Ok.

Nicolas> True indeed. I generated those patches with svn diff, and Nicolas> being so used to git I forgot that other systems have Nicolas> different defaults.

Nicolas> Now what about the 10 or so other patches I posted? Will Nicolas> they get merged? I have more patches to post but I wanted Nicolas> to see what was going to happen with this lot first.

I haven't gotten around to look at them yet. I will sooner or later, but I'm afraid I cannot give you any guarantees regarding time frame.

The other developers are more than welcome to assist.

Bye, Peter Korsgaard