rpms/yaboot/devel yaboot-1.3.13-allow-deep-mntpoint.patch, NONE, 1.1 yaboot.spec, 1.20, 1.21

[fedora-cvs-commits at redhat.com]

Author: dwmw2

Update of /cvs/dist/rpms/yaboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8143

Modified Files:
	yaboot.spec 
Added Files:
	yaboot-1.3.13-allow-deep-mntpoint.patch 
Log Message:
make it work the way I want the installer to set it up on Pegasos

yaboot-1.3.13-allow-deep-mntpoint.patch:
 ybin |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

--- NEW FILE yaboot-1.3.13-allow-deep-mntpoint.patch ---
--- yaboot-1.3.13/ybin/ybin~	2005-08-10 15:09:32.000000000 +0100
+++ yaboot-1.3.13/ybin/ybin	2005-08-11 16:13:36.000000000 +0100
@@ -353,17 +353,19 @@ checkconf()
 	fi
 
 	## make sure $mntpoint is on $boot, this matters to nvram updating.
-	if [ "$(v=`df "$mntpoint" 2> /dev/null | grep ^/dev/` ; echo ${v%%[ ]*})" != "$boot" -a -d "$mntpoint" ] ; then
-	    echo 1>&2 "$PRG: $mntpoint is not located on $boot"
-	    local CONFERR=1
-	    ## more then one subdirectory deep is not supported. no sed available on boot floppies ( / -> \ )
-	elif [ "$mntpoint" != "$(v=`df "$mntpoint" 2> /dev/null | grep ^/dev/` ; echo ${v##*[ ]})" ] ; then
-	    echo "$(v=`df "$mntpoint" 2>/dev/null | grep ^/dev/`; m=${v##*[ ]}; echo "${mntpoint##*$m/}")" | grep -q /
-	    if [ $? = 0 ] ; then
-		echo 1>&2 "$PRG:$ERR $mntpoint is more then one subdirectory deep from root of $boot"
+	if [ -n "$magicboot" -o "$nonvram" = 0 ]; then
+	    if [ "$(v=`df "$mntpoint" 2> /dev/null | grep ^/dev/` ; echo ${v%%[ ]*})" != "$boot" -a -d "$mntpoint" ] ; then
+		echo 1>&2 "$PRG: $mntpoint is not located on $boot"
 		local CONFERR=1
-	    else
-		OFDIR="$(v=`df "$mntpoint" 2>/dev/null | grep ^/dev/`; m=${v##*[ ]}; echo "${mntpoint##*$m/}")"
+	    ## more than one subdirectory deep is not supported. no sed available on boot floppies ( / -> \ )
+	    elif [ "$mntpoint" != "$(v=`df "$mntpoint" 2> /dev/null | grep ^/dev/` ; echo ${v##*[ ]})" ] ; then
+		echo "$(v=`df "$mntpoint" 2>/dev/null | grep ^/dev/`; m=${v##*[ ]}; echo "${mntpoint##*$m/}")" | grep -q /
+		if [ $? = 0 ] ; then
+		    echo 1>&2 "$PRG:$ERR $mntpoint is more then one subdirectory deep from root of $boot"
+		    local CONFERR=1
+		else
+		    OFDIR="$(v=`df "$mntpoint" 2>/dev/null | grep ^/dev/`; m=${v##*[ ]}; echo "${mntpoint##*$m/}")"
+		fi
 	    fi
 	fi
 


Index: yaboot.spec
===================================================================
RCS file: /cvs/dist/rpms/yaboot/devel/yaboot.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- yaboot.spec	11 Aug 2005 13:50:37 -0000	1.20
+++ yaboot.spec	11 Aug 2005 15:24:05 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.13
-Release: 0.7
+Release: 0.8
 License: GPL
 Group: System Environment/Base
 Source: http://penguinppc.org/bootloaders/yaboot/yaboot-%{version}.tar.gz
@@ -26,6 +26,7 @@
 Patch19: yaboot-1.3.13-confarg.patch
 Patch20: yaboot-1.3.13-ofpath-pegasos.patch
 Patch21: yaboot-1.3.13-pegasos-serial.patch
+Patch22: yaboot-1.3.13-allow-deep-mntpoint.patch
 
 URL: http://penguinppc.org/bootloaders/yaboot/
 BuildRoot: %{_tmppath}/%{name}-root
@@ -62,6 +63,7 @@
 %patch19 -p1 -b .confarg
 %patch20 -p1 -b .ofpath
 %patch21 -p1 -b .pegasos-serial
+%patch22 -p1 -b .deepmnt
 
 %build
 make
@@ -95,6 +97,10 @@
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Thu Aug 11 2005 David Woodhouse <dwmw2 at redhat.com> - 1.3.13-0.8
+- Allow mntpoint to be more than one directory into the partition 
+  as long as magicboot and nvram are not being used.
+
 * Thu Aug 11 2005 David Woodhouse <dwmw2 at redhat.com> - 1.3.13-0.7
 - Fix error in swraid2 patch -- don't dereference NULL pointer.