From 7e71b4c51f336f8a0c1dcf6ec20e7fbb096ca479 Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@opensde.org>
Date: Tue, 23 Dec 2008 14:32:40 +0200
Subject: [PATCH] init: moved /etc/conf/idunn creating to rc.sysinit

---
 initramfs/etc_rc.d_rc.sysinit.sh | 21 +++++++++++++++++++++
 initramfs/init.sh                |  6 ------
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/initramfs/etc_rc.d_rc.sysinit.sh b/initramfs/etc_rc.d_rc.sysinit.sh
index 035e9e3..aa44c64 100644
--- a/initramfs/etc_rc.d_rc.sysinit.sh
+++ b/initramfs/etc_rc.d_rc.sysinit.sh
@@ -29,6 +29,27 @@ check mount -n -t sysfs sysfs /sys
 check mount -n -t tmpfs tmp /tmp
 status
 
+# Parse command line
+init=
+root=
+root_mode=
+
+for x in $(cat /proc/cmdline | tr -d ";\"'"); do
+	case "$x" in
+	ro|rw)	root_mode=$x ;;
+	root=*|init=*)
+		eval "$x" ;;
+	esac
+done
+
+cat > /etc/conf/idunn <<EOT
+rootfs="/rootfs"
+root="$root"
+root_mode="${root_mode:-rw}"
+init="${init:-/sbin/init}"
+initopt="$*"
+EOT
+
 title "Preparing /dev"
 check mount -n -t tmpfs udev /dev
 check mkdir /dev/pts
diff --git a/initramfs/init.sh b/initramfs/init.sh
index ba5fb84..b193e66 100644
--- a/initramfs/init.sh
+++ b/initramfs/init.sh
@@ -52,12 +52,6 @@ for x in USR1 USR2 TERM INT; do
 	trap "shutoff_handler $x" $x
 done
 
-cat > /etc/conf/idunn <<EOT
-root="$root"
-init="${init:-/sbin/init}"
-initopt="$*"
-EOT
-
 # start the world
 /etc/rc.d/rc.sysinit 2>&1 | tee -a $LOG