New up() functions in rc scripts.

diff --git a/etc/rc b/etc/rc
index 9fd89f1313c3a58b87dad90fcd6c9d3fcd5f5bc7..ac72e44780a61662610c3fb64016a2873e4cb694 100755 (executable)
--- a/etc/rc
+++ b/etc/rc
@@ -15,12 +15,11 @@ usage()
 up()
 {
     service=$1
-    args=$2
+    shift
 
     # Function to dynamically start a system service
     echo -n " $service"
-    command="/sbin/$service $args"
-    eval service up $command
+    service up /sbin/$service "$@"
 }
 
 while getopts 'saf' opt
@@ -52,11 +51,11 @@ start)
     # Start crucial system services. The floppy driver *must* be loaded 
     # first, as it needs memory below 16MB in order to do ISA DMA.
     if [ ! "`sysenv label`" = "FLOPPY" ]  
-    then up floppy "-dev /dev/fd0 -period 5HZ"
-    else up at_wini "-dev /dev/c0d0 -period 5HZ"
+    then up floppy -dev /dev/fd0 -period 5HZ
+    else up at_wini -dev /dev/c0d0 -period 5HZ
     fi
-    up is "-period 5HZ"
-    up cmos "-dev /dev/cmos -period 5HZ"
+    up is -period 5HZ
+    up cmos -dev /dev/cmos -period 5HZ
     echo .
 
     # Set timezone.

diff --git a/etc/usr/rc b/etc/usr/rc
index 8ce67b975e0113851007fba53a2b90899f1b3dec..4b9a50a7a6946831c6d9f6e322f56a9ec07a3f8d 100644 (file)
--- a/etc/usr/rc
+++ b/etc/usr/rc
@@ -55,7 +55,7 @@ daemonize()
 up()
 {
     service=$1
-    args=$2
+    shift
 
     # Function to dynamically start a system service
 
@@ -64,8 +64,7 @@ up()
 
     # Service is not disabled. Try to bring it up.
     echo -n " $service"
-    command="/usr/sbin/$service $args"
-    eval service up $command
+    service up /usr/sbin/$service "$@" 
 }
 
 case $action in
@@ -78,7 +77,7 @@ start)
 
     # Start servers and drivers set at the boot monitor.
     echo -n "Starting services:"
-    up random "-dev /dev/random -period 3HZ"
+    up random -dev /dev/random -period 3HZ
 
     # load random number generator
     if [ -f $RANDOM_FILE ]
@@ -94,11 +93,12 @@ start)
         if grep " $driver " /etc/inet.conf > /dev/null  2>&1
         then 
             eval arg=\$${driver}_arg
-            up $driver "$arg -period 5HZ"
+           if [ ! -z "$arg" ]; then arg="-args \"$arg\""; fi
+            eval up $driver $arg -period 5HZ
         fi
     done
-    up inet "-period 3HZ"
-    up printer "-dev /dev/lp -period 10HZ"
+    up inet 
+    up printer -dev /dev/lp -period 10HZ
     echo .
 
     # Network initialization.