summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorJeff Bailey <jbailey@ubuntu.com>2005-06-17 12:17:42 +0000
committerJeff Bailey <jbailey@ubuntu.com>2005-06-17 12:17:42 +0000
commitbf8d6100fb13127151c309d842185b3a250ecfff (patch)
treef43c7051e0bc5faafd246b0f647fc651a873d454 /init
parent9c603dd111d019e87d0135459d3b15c996565e14 (diff)
downloadinitramfs-tools-bf8d6100fb13127151c309d842185b3a250ecfff.tar.gz
initramfs-tools-bf8d6100fb13127151c309d842185b3a250ecfff.zip
Integrate Matt Zimmerman's changes to initramfs
Diffstat (limited to 'init')
-rw-r--r--init10
1 files changed, 3 insertions, 7 deletions
diff --git a/init b/init
index 73981a5..52e10bd 100644
--- a/init
+++ b/init
@@ -30,10 +30,10 @@ for x in $(cat /proc/cmdline); do
BOOT=${x#boot=}
;;
ro)
- readonly=yes
+ readonly=y
;;
rw)
- readonly=no
+ readonly=n
;;
break)
break=yes
@@ -45,11 +45,7 @@ run_scripts /scripts/init-top
. /scripts/${BOOT}
-# Load the modules
-# FIXME - do module options here
-for x in $(cat /conf/modules); do
- modprobe $x
-done
+load_modules
# Populate /dev tree
udevstart