first prerelease 0.86 + merge 0.85f

* kick mdrun script
* update control for lenny + ubuntu
* add _all_ ide, block and drivers
* use MODPROBE_OPTIONS and kill any modprobed arg
* small doc + whitespace fixes

1 files changed, 9 insertions, 4 deletions

diff --git a/init b/init
index fbe32be..4c09fd7 100755
--- a/init
+++ b/init
@@ -8,8 +8,8 @@ echo "Loading, please wait..."
 [ -d /proc ] || mkdir /proc
 [ -d /tmp ] || mkdir /tmp
 mkdir -p /var/lock
-mount -t sysfs none /sys
-mount -t proc none /proc
+mount -t sysfs none /sys -o nodev, noexec, nosuid
+mount -t proc none /proc -o nodev, noexec, nosuid
 
 # Note that this only becomes /dev on the real filesystem if udev's scripts
 # are used; which they will be, but it's worth pointing out
@@ -37,7 +37,10 @@ for i in conf/conf.d/*; do
 done
 . /scripts/functions
 
-# Parse command line options
+# Set modprobe env
+export MODPROBE_OPTIONS="-qb"
+
+# Export relevant variables
 export break=
 export init=/sbin/init
 export quiet=n
@@ -45,8 +48,10 @@ export readonly=y
 export rootmnt=/root
 export debug=
 export cryptopts=${CRYPTOPTS}
-export panic
+export ROOTDELAY=
+export panic=
 
+# Parse command line options
 for x in $(cat /proc/cmdline); do
 	case $x in
 	init=*)