From: Brad House <brad_mssw@gentoo.org>
Date: Wed, 25 Feb 2004 20:12:52 +0000 (+0000)
Subject: script updates, less debugging, and modprobe return code fix
X-Git-Tag: v3.4.10.902~668
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8de7af2c61ea84ab4e80bdc0701045bade35a567;p=genkernel.git

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 7df4c94..000ce3d 100644
--- 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 7d08440..589efdd 100755
--- 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