script updates, less debugging, and modprobe return code fix

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@84 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/generic/linuxrc b/generic/linuxrc
index 7df4c94a21b11f034908d2308301de2c3c5872a6..000ce3de297e07c944301e0ea0684dedce660a29 100644 (file)
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -296,7 +296,7 @@ then
        # asking questions!
        umount /dev
        umount /proc
-       cp -f /etc/mtab /etc/mtab.initrd-here
+       cp -f /etc/mtab /etc/mtab.initrd-here > /dev/null 2>&1
 
 elif [ "${CDROOT}" -eq "1" ]
 then
@@ -304,12 +304,9 @@ then
        # also umount proc
        echo "STEP 6a: clean up mounts"
        mount -t proc proc /proc
-       mount -t devfs devfs /dev
-       umount /tmp/.initrd/dev || echo "COULD NOT UMOUNT /tmp/.initrd/dev !!!"
-       umount /tmp/.initrd/proc || echo "COULD NOT UMOUNT /tmp/.initrd/proc !!!"
-
-       umount /dev
-       umount /proc
+       umount /tmp/.initrd/proc > /dev/null 2>&1 || echo "COULD NOT UMOUNT /tmp/.initrd/proc !!!"
+       umount /dev > /dev/null 2>&1
+       umount /proc > /dev/null 2>&1
 fi
 
 # /usr/src/linux/Documentation/initrd.txt 
@@ -317,7 +314,6 @@ fi
 #       exec chroot . /sbin/init </dev/console >/dev/console 2>&1
 
 exec chroot . /bin/sh <<- EOF
-       echo "UMOUNTING /tmp/.initrd"
        umount /tmp/.initrd || echo "UMOUNT of /tmp/.initrd FAILED!!!" && /sbin/blockdev --flushbufs /dev/ram0
        echo "INIT: starting /sbin/init ${CMDLINE}"
        exec /sbin/init ${CMDLINE}

diff --git a/generic/modprobe b/generic/modprobe
index 7d084406ce5ea4d530f0d9938301a32b900c8c1d..589efdd002ad68b75e3dd7237cef6e47f60d679f 100755 (executable)
--- a/generic/modprobe
+++ b/generic/modprobe
@@ -149,6 +149,7 @@ do
 done
 
 modprobe2 ${1}
+modprobe_ret=$?
 
 [ -f "/modules.cache" ] && rm -f /modules.cache > /dev/null 2>&1
 for x in ${LOADED_MODULES}
@@ -156,5 +157,4 @@ do
        echo $x >> /modules.cache
 done
 
-exit $?
-
+exit $modprobe_ret