[Debian-live-changes] r2542 - dists/trunk/live-helper/helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-07-20 05:16:04 +0000 (Fri, 20 Jul 2007)
New Revision: 2542

Modified:
   dists/trunk/live-helper/helpers/lh_binary_iso
   dists/trunk/live-helper/helpers/lh_binary_yaboot
   dists/trunk/live-helper/helpers/lh_clean
Log:


Modified: dists/trunk/live-helper/helpers/lh_binary_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_iso	2007-07-20 05:08:54 UTC (rev 2541)
+++ dists/trunk/live-helper/helpers/lh_binary_iso	2007-07-20 05:16:04 UTC (rev 2542)
@@ -142,7 +142,12 @@
 		;;
 
 	disabled)
-		${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -J -l -cache-inodes binary
+cat > binary.sh << EOF
+${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -J -l -cache-inodes binary
+EOF
+
+		sh binary.sh
+		rm -f binary.sh
 		;;
 esac
 

Modified: dists/trunk/live-helper/helpers/lh_binary_yaboot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-07-20 05:08:54 UTC (rev 2541)
+++ dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-07-20 05:16:04 UTC (rev 2542)
@@ -239,7 +239,17 @@
 	iso|usb-hdd)
 		# Copying yaboot
 		mkdir -p binary/yaboot
-		cp chroot/usr/lib/yaboot/yaboot binary/yaboot
+
+		case "${LH_CHROOT_BUILD}" in
+			enabled)
+				cp chroot/usr/lib/yaboot/yaboot binary/yaboot
+				;;
+
+			disabled)
+				cp /usr/lib/yaboot/yaboot binary/yaboot
+				;;
+		esac
+
 		cp -r "${TEMPLATES}"/* binary/yaboot
 
 		if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]

Modified: dists/trunk/live-helper/helpers/lh_clean
===================================================================
--- dists/trunk/live-helper/helpers/lh_clean	2007-07-20 05:08:54 UTC (rev 2541)
+++ dists/trunk/live-helper/helpers/lh_clean	2007-07-20 05:16:04 UTC (rev 2542)
@@ -79,6 +79,7 @@
 		rm -f binary.iso
 		rm -f binary.img
 		rm -f binary*.tar.gz
+		rm -f binary.sh
 
 		rm -rf binary
 		rm -rf tftpboot