From: Ben Gras <ben@minix3.org>
Date: Fri, 5 Aug 2005 10:37:02 +0000 (+0000)
Subject: added /sbin in mtree
X-Git-Tag: v3.1.0~443
X-Git-Url: http://zhaoyanbai.com/repos/%7B%24global.css%7D?a=commitdiff_plain;h=e21c135fe558ee1bb5a7ff8583efd824bc751a8f;p=minix.git

added /sbin in mtree

/usr/etc/rc now reads variables from /usr/etc/rc.local it can feed to
drivers as args
---

diff --git a/etc/mtree/minix.tree b/etc/mtree/minix.tree
index d9e056ba4..aeb39b7f0 100644
--- a/etc/mtree/minix.tree
+++ b/etc/mtree/minix.tree
@@ -1,5 +1,6 @@
 755 root    operator /
 755 bin     operator /bin
+755 bin     operator /sbin
 755 root    operator /dev
 755 root    operator /etc
 755 root    operator /lib
diff --git a/etc/usr/rc b/etc/usr/rc
index 1aacef5ae..87d9ff47e 100644
--- a/etc/usr/rc
+++ b/etc/usr/rc
@@ -1,6 +1,7 @@
 # /usr/etc/rc - continued system initialization.
 
 RANDOM_FILE=/usr/adm/random.dat
+LOCAL_FILE=/usr/etc/rc.local
 
 case "$#:$1" in
 1:start|1:stop|1:down)
@@ -10,6 +11,10 @@ case "$#:$1" in
     exit 1
 esac
 
+if [ -f "$LOCAL_FILE" ]
+then	. "$LOCAL_FILE" $1
+fi
+
 disabled()
 {
     ifs="$IFS"; IFS=,
@@ -91,7 +96,8 @@ start)
     do
         if grep " $driver " /etc/inet.conf > /dev/null 
         then 
-            up $driver 
+            eval arg=\$${driver}_arg
+            up $driver "$arg"
         fi
     done
     up inet ""