Index: init.d/halt.sh
===================================================================
RCS file: /home/cvsroot/gentoo-src/rc-scripts/init.d/halt.sh,v
retrieving revision 1.46
diff -u -r1.46 halt.sh
--- init.d/halt.sh	26 Nov 2003 19:16:18 -0000	1.46
+++ init.d/halt.sh	24 Jan 2004 16:37:52 -0000
@@ -48,7 +48,8 @@
 # Unmount file systems, killing processes if we have to.
 # Unmount loopback stuff first
 # Use `umount -d` to detach the loopback device
-remaining="`awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $2}' /proc/mounts | sort -r`"
+remaining="`awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $2}' /proc/mounts | \
+            sort -r | sed -e 's:/mnt/livecd::g'`"
 [ -n "${remaining}" ] && {
 	sig=
 	retry=3
@@ -66,7 +67,8 @@
 			eend $? "Failed to unmount filesystems"
 		fi
 		
-		remaining="`awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $2}' /proc/mounts | sort -r`"
+		remaining="`awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $2}' /proc/mounts | \
+		            sort -r | sed -e 's:/mnt/livecd::g'`"
 		[ -z "${remaining}" ] && break
 		
 		/bin/fuser -k -m ${sig} ${remaining} &>/dev/null
Index: init.d/modules
===================================================================
RCS file: /home/cvsroot/gentoo-src/rc-scripts/init.d/modules,v
retrieving revision 1.28
diff -u -r1.28 modules
--- init.d/modules	11 Aug 2003 01:27:16 -0000	1.28
+++ init.d/modules	24 Jan 2004 16:37:52 -0000
@@ -82,9 +82,12 @@
 		return 1
 	fi
 	
-	ebegin "Calculating module dependencies"
-	/sbin/modules-update &>/dev/null
-	eend $? "Failed to calculate dependencies"
+	if [ -z "${CDBOOT}" ]
+	then
+		ebegin "Calculating module dependencies"
+		/sbin/modules-update &>/dev/null
+		eend $? "Failed to calculate dependencies"
+	fi
 
 	if [ -f /etc/modules.autoload -a ! -L /etc/modules.autoload ]
 	then