This commit was manufactured by cvs2svn to create branch 'b3_1_1'.

diff --git a/etc/rc b/etc/rc
index 9fd89f1313c3a58b87dad90fcd6c9d3fcd5f5bc7..61e542df78b4768afb5bee2a69cb18570ad120e5 100755 (executable)
--- a/etc/rc
+++ b/etc/rc
@@ -16,10 +16,13 @@ up()
 {
     service=$1
     args=$2
+    device=$3
 
     # Function to dynamically start a system service
+    command="/sbin/$service"
+    if [ ! -z "$args" ]; then command="$command -args \"$args\""; fi
+    if [ ! -z "$device" ]; then command="$command -dev \"$device\""; fi
     echo -n " $service"
-    command="/sbin/$service $args"
     eval service up $command
 }
 
@@ -52,11 +55,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/fd0
+    else up at_wini "" /dev/c0d0
     fi
-    up is "-period 5HZ"
-    up cmos "-dev /dev/cmos -period 5HZ"
+    up is ""
+    up cmos "" /dev/cmos
     echo .
 
     # Set timezone.

diff --git a/etc/rc.rescue b/etc/rc.rescue
index d3b0e52602a3228b34fa1461c075eca90201ac74..444542c457fd5da5bd35864ca6f5ea6eaeac1092 100644 (file)
--- a/etc/rc.rescue
+++ b/etc/rc.rescue
@@ -6,7 +6,7 @@ if [ "$1" != start ]
 then   exit
 fi
 
-service up $DRIVERS/rescue -dev /dev/rescue -args 128 -period 4HZ
+service up $DRIVERS/rescue -dev /dev/rescue -args 128
 mkfs /dev/rescue || exit
 mount /dev/rescue $RESCUE || exit
 cp $DRIVERS/memory $RESCUE
@@ -25,4 +25,4 @@ BIOS)
        ;;
 esac
 cp $DRIVERS/$d $RESCUE/driver
-service rescue $RESCUE 
+service rescue $RESCUE

diff --git a/etc/usr/rc b/etc/usr/rc
index 8ce67b975e0113851007fba53a2b90899f1b3dec..389a1b40d31dbc1527ca9af8c7bb95aabe93ac8f 100644 (file)
--- a/etc/usr/rc
+++ b/etc/usr/rc
@@ -56,6 +56,7 @@ up()
 {
     service=$1
     args=$2
+    device=$3
 
     # Function to dynamically start a system service
 
@@ -63,8 +64,10 @@ up()
     if disabled $service; then return; fi
 
     # Service is not disabled. Try to bring it up.
+    command="/usr/sbin/$service"
+    if [ ! -z "$args" ]; then command="$command -args \"$args\""; fi
+    if [ ! -z "$device" ]; then command="$command -dev \"$device\""; fi
     echo -n " $service"
-    command="/usr/sbin/$service $args"
     eval service up $command
 }
 
@@ -78,7 +81,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/random
 
     # load random number generator
     if [ -f $RANDOM_FILE ]
@@ -94,11 +97,11 @@ start)
         if grep " $driver " /etc/inet.conf > /dev/null  2>&1
         then 
             eval arg=\$${driver}_arg
-            up $driver "$arg -period 5HZ"
+            up $driver "$arg"
         fi
     done
-    up inet "-period 3HZ"
-    up printer "-dev /dev/lp -period 10HZ"
+    up inet ""
+    up printer "" /dev/lp
     echo .
 
     # Network initialization.