Re: [gentoo-releng] Baselayout questions[Message Scanned]

[Martin Schlemmer <azarah@gentoo.org>]

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

On Fri, 2004-02-06 at 21:48, Benjamin Judas wrote:
> Am Fr, den 06.02.2004 schrieb Martin Schlemmer um 18:41:
> > On Fri, 2004-02-06 at 15:28, Benjamin Judas wrote:
> > > Am Do, den 05.02.2004 schrieb Martin Schlemmer um 20:00:
> > > > On Wed, 2004-02-04 at 23:25, John Davis wrote:
> > > > > -----BEGIN PGP SIGNED MESSAGE-----
> > > > > Hash: SHA1
> > > > > 
> > > > > Hi all -
> > > > > Just wondering, when is the updated (fixes for /dev, livecds, etc)
> > > > > baselayout going to go stable? We cannot release stages that are using
> > > > > an arch masked baselayout to build them. If there are any outstanding QA
> > > > > issues, please let us know so that we can test the bejeezus out of it.
> > > > > 
> > > > 
> > > > I did send it to beejay - awaiting his final approval.
> > > > 
> > > > 
> > > > Thanks,
> > > 
> > > sys-apps/baselayout-1.8.6.12-r4 is working fine on the last official and
> > > the numerous internal test-cd's I created. If nobody else has doubts, I
> > > suggest to move baselayout-1.8.6.12-r4 out of testing into stable.
> > > 
> > 
> > Right, but what about the last patch I sent you with cosmetic changes?
> > 
> > 
> > Thanks.
> 
> I built a test-image with baselayout-1.8.6.12-r5 + applying your patch -
> now the cd doesn't reboot and halt again.

Ok, I have a small problem here - the cd do not boot here - the gentoo
kernel locks up with spurious interrupts on keyboard controller, and the
experimental  oops because it have both acpi irq handling _and_ pnp.  I
thus cannot test it.

Anyhow, please try attached patch - it might be the removal of the
newroot stuff.  I know its much to ask, but even if you can just hand
edit it, and do:

--
Index: init.d/halt.sh
===================================================================
RCS file: /home/cvsroot/gentoo-src/rc-scripts/init.d/halt.sh,v
retrieving revision 1.47
diff -u -r1.47 halt.sh
--- init.d/halt.sh      6 Feb 2004 19:33:59 -0000       1.47
+++ init.d/halt.sh      7 Feb 2004 19:22:48 -0000
@@ -55,7 +55,7 @@
 # Unmount loopback stuff first
 # Use `umount -d` to detach the loopback device
 remaining="`awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $2}' /proc/mounts | \
-            sort -r | grep -v '/mnt/livecd'`"
+            sort -r | grep -v '/newroot' | grep -v '/mnt/livecd'`"
 [ -n "${remaining}" ] && {
        sig=
        retry=3
@@ -74,7 +74,7 @@
                fi
  
                remaining="`awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $2}' /proc/mounts | \
-                           sort -r | | grep -v '/mnt/livecd'`"
+                           sort -r | grep -v '/newroot' | grep -v '/mnt/livecd'`"
                [ -z "${remaining}" ] && break
  
                /bin/fuser -k -m ${sig} ${remaining} &>/dev/null
--

Complete patch also attached.


Thanks,

-- 

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: 5977 bytes --]

Index: init.d/checkfs
===================================================================
RCS file: /home/cvsroot/gentoo-src/rc-scripts/init.d/checkfs,v
retrieving revision 1.32
diff -u -r1.32 checkfs
--- init.d/checkfs	5 Jan 2004 23:50:42 -0000	1.32
+++ init.d/checkfs	4 Feb 2004 19:34:49 -0000
@@ -14,7 +14,7 @@
 	#
 	# EVMS2 summport for /usr, /var ....
 	#
-	if [ -f /sbin/evms_activate ]
+	if [ -z "${CDBOOT}" -a -f /sbin/evms_activate ]
 	then
 		ebegin "Activating EVMS2"
 		evms_activate
@@ -29,7 +29,7 @@
 	# NOTE: Add needed modules for LVM or RAID, etc
 	#       to /etc/modules.autoload if needed
 	
-	if [ -x /sbin/vgscan ] && \
+	if [ -z "${CDBOOT}" -a -x /sbin/vgscan ] && \
 	   [ -d /proc/lvm -o "$(grep device-mapper /proc/misc 2>/dev/null)" ]
 	then
 		ebegin "Setting up the Logical Volume Manager"
@@ -48,7 +48,7 @@
 	# properly configured /etc/mdadm.conf for mdadm usage. Devices in
 	# /etc/mdadm.conf are initialized first, so any duplicate devices in
 	# /etc/raidtab will not get initialized.
-	if [ -f /proc/mdstat ]
+	if [ -z "${CDBOOT}" -a -f /proc/mdstat ]
 	then
 		local mdadm_devices=
 		local raidtools_devices=
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	4 Feb 2004 19:34:49 -0000
@@ -3,6 +3,12 @@
 # $Header: /home/cvsroot/gentoo-src/rc-scripts/init.d/halt.sh,v 1.46 2003/11/26 19:16:18 azarah Exp $
 
 
+# Check to see if this is a livecd, if it is read the commandline
+# this mainly makes sure $CDBOOT is defined if it's a livecd
+[ -f "/sbin/livecd-functions.sh" ] && \
+	source /sbin/livecd-functions.sh && \
+	livecd_read_commandline
+
 # Reset pam_console permissions
 [ -x /sbin/pam_console_apply -a ! -c /dev/.devfsd ] && \
 	/sbin/pam_console_apply -r
@@ -48,7 +54,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 | grep -v '/newroot' | grep -v '/mnt/livecd'`"
 [ -n "${remaining}" ] && {
 	sig=
 	retry=3
@@ -66,7 +73,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 | | grep -v '/newroot' | grep -v '/mnt/livecd'`"
 		[ -z "${remaining}" ] && break
 		
 		/bin/fuser -k -m ${sig} ${remaining} &>/dev/null
@@ -89,13 +97,20 @@
 for x in `awk '{ print $2 }' /proc/mounts | sort -r | uniq`
 do
 	do_unmount="yes"
+
+	# Do not umount these if we are booting off a livecd
+	if [ -n "${CDBOOT}" ] && \
+	   [ "${x}" != "/mnt/cdrom" -a "${x}" != "/mnt/livecd" ]
+	then
+		continue
+	fi
 	
 	for y in ${no_unmounts}
 	do
 		[ "${x}" = "${y}" ] && do_unmount="no"
 	done
 	
-	if [ "${do_unmount}" = "yes" -a "${x}" != "/mnt/livecd" ]
+	if [ "${do_unmount}" = "yes" ]
 	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	4 Feb 2004 19:34:49 -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
Index: sbin/rc
===================================================================
RCS file: /home/cvsroot/gentoo-src/rc-scripts/sbin/rc,v
retrieving revision 1.71
diff -u -r1.71 rc
--- sbin/rc	21 Jan 2004 18:03:11 -0000	1.71
+++ sbin/rc	4 Feb 2004 19:34:49 -0000
@@ -168,7 +168,7 @@
 	# Read off the kernel commandline to see if there's any special settings
 	# especially check to see if we need to set the  CDBOOT environment variable
 	# Note: /proc MUST be mounted
-	livecd_read_commandline
+	[ -f /sbin/livecd-functions.sh ] && livecd_read_commandline
 
 	if [ -d /sys -a "$(get_KV)" -ge "$(KV_to_int '2.6.0')" ]
 	then
@@ -418,7 +418,7 @@
 	fi
 
 	# If booting off CD, we want to update inittab before setting the runlevel
-	if [ "${CDBOOT}" != "" ]
+	if [ -f "/sbin/livecd-functions.sh" -a -n "${CDBOOT}" ]
 	then
 		ebegin "Updating inittab"
 		livecd_fix_inittab
Index: src/awk/gendepends.awk
===================================================================
RCS file: /home/cvsroot/gentoo-src/rc-scripts/src/awk/gendepends.awk,v
retrieving revision 1.19
diff -u -r1.19 gendepends.awk
--- src/awk/gendepends.awk	29 Dec 2003 01:00:27 -0000	1.19
+++ src/awk/gendepends.awk	4 Feb 2004 19:34:49 -0000
@@ -466,14 +466,14 @@
 		print "" >> (CACHEDTREE)
 	}
 
-	print "export RC_DEPEND_TREE" >> (CACHEDTREE)
-	print "export RC_GOT_DEPTREE_INFO=\"yes\"" >> (CACHEDTREE)
+	# Do not export these, as we want them local
+	print "RC_GOT_DEPTREE_INFO=\"yes\"" >> (CACHEDTREE)
 	print "" >> (CACHEDTREE)
 
 	if (check_provide("logger"))
-		print "export LOGGER_SERVICE=\"" get_provide("logger") "\"" >> (CACHEDTREE)
+		print "LOGGER_SERVICE=\"" get_provide("logger") "\"" >> (CACHEDTREE)
 	else
-		print "export LOGGER_SERVICE=" >> (CACHEDTREE)
+		print "LOGGER_SERVICE=" >> (CACHEDTREE)
 		
 	close(CACHEDTREE)
 }

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