From bf8d6100fb13127151c309d842185b3a250ecfff Mon Sep 17 00:00:00 2001
From: Jeff Bailey <jbailey@ubuntu.com>
Date: Fri, 17 Jun 2005 12:17:42 +0000
Subject: Integrate Matt Zimmerman's changes to initramfs

---
 init | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'init')

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
-- 
cgit v1.2.3