From 81098e2a523b4567e3e7e056a3704fa6b57d6ad0 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Tue, 18 Mar 2008 19:56:18 +0000 Subject: [PATCH] [early] Changed init to not make mdadm and lvm activations fail if the module didn't load, it may be built-in. --- target/early/initramfs/init.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/target/early/initramfs/init.sh b/target/early/initramfs/init.sh index 4f5dae8..2a962a2 100644 --- a/target/early/initramfs/init.sh +++ b/target/early/initramfs/init.sh @@ -101,8 +101,8 @@ if [ ! -e "$root" ]; then if [ "$want_mdadm" != no -a -s /etc/mdadm.conf ]; then # try activating software raids title "Activating RAID devices" - check modprobe md-mod - check udevsettle + modprobe -q md-mod + udevsettle check mdadm -As --auto=yes status fi @@ -117,8 +117,8 @@ if [ ! -e "$root" ]; then if [ "$want_lvm" != no -a -d /etc/lvm/archive ]; then title "Activating LVM devices" - check modprobe dm_mod - check udevsettle + modprobe -q dm_mod + udevsettle check lvm vgchange -ay status fi @@ -145,6 +145,7 @@ fi # wait for /sbin/init while [ ! -x "/rootfs$init" ]; do + # one shell is enough want_shell=no echo -e "\nPlease mount root device on /rootfs and exit to continue." /sbin/getsh @@ -163,3 +164,4 @@ check mount -t none -o move /proc /rootfs/proc status exec switch_root /rootfs "$init" $initargs +#FIXME: what if it fails?