Re: [gentoo-releng] x86-livecd - bugs and suggestions

[Martin Schlemmer <azarah@gentoo.org>]

[-- Attachment #1.1: Type: text/plain, Size: 1859 bytes --]

On Sun, 2004-01-25 at 00:51, Benjamin Judas wrote:
> Am Sa, den 24.01.2004 schrieb Martin Schlemmer um 17:40:
> > On Sat, 2004-01-24 at 18:38, Martin Schlemmer wrote:
> > > On Fri, 2004-01-23 at 22:22, Benjamin Judas wrote:
> > > > Am Fr, den 23.01.2004 schrieb Martin Schlemmer um 19:01:
> > > > 
> > > > > Is /lib/modules/<ver>/ writable?  It needs to be so ...
> > > > 
> > > > Gotcha! - This directory isn't writeable, because:
> > > > 
> > > > --8<-------------------------------------------------------
> > > > livecd / # ls -al
> > > > ...
> > > > lrwxrwxrwx    1 root     root   21 Jan 23 11:29 lib ->
> > > > mnt/cdrom/zisofs/lib
> > > > ...
> > > > -->8--------------------------------------------------------
> > > > 
> > > > 
> > > > and:
> > > > 
> > > > --8<--------------------------------------------------------
> > > > livecd / # mount
> > > > ...
> > > > /newroot/dev/cdroms/cdrom0 on /mnt/cdrom type is9660 (ro)
> > > > ...
> > > > -->8--------------------------------------------------------
> > > > Additional Info : There is no /newroot in livecd's /
> > > > 
> > > > 
> > > > > Could you add a 'cat /proc/mounts' to the end of halt.sh, also include
> > > > > one before calling 'halt'.
> > > > 
> > > > see attached .png-file
> > > 
> > > Could you try attached patch?
> > > 
> > 
> > Err, should be this one.
> > 
> > > 
> > > Thanks,
> 
> Patch for modules works fabulous, no error-message anymore. But complete
> shutdown still fails.
> 

Ok, I missed a spot - try this one.  One thing I am not too sure about,
is the sed's added on the loop section ... you might add a 
'cat /proc/mounts' just after to verify that it did not unmount it if
there are still issues ...


-- 

Martin Schlemmer
Gentoo Linux Developer, Desktop/System Team Developer
Cape Town, South Africa



[-- Attachment #1.2: rc-scripts-livecd.patch --]
[-- Type: text/x-patch, Size: 2120 bytes --]

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	25 Jan 2004 06:24:00 -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:/newroot::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:/newroot::g'`"
 		[ -z "${remaining}" ] && break
 		
 		/bin/fuser -k -m ${sig} ${remaining} &>/dev/null
@@ -95,7 +97,7 @@
 		[ "${x}" = "${y}" ] && do_unmount="no"
 	done
 	
-	if [ "${do_unmount}" = "yes" -a "${x}" != "/mnt/livecd" ]
+	if [ "${do_unmount}" = "yes" -a "${x}" != "/newroot" ]
 	then
 		umount ${x} &>/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	25 Jan 2004 06:24:00 -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

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]