[Debian-live-changes] r1542 - in dists/trunk/live-helper: . helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-18 08:38:07 +0000 (Fri, 18 May 2007)
New Revision: 1542

Modified:
   dists/trunk/live-helper/Makefile
   dists/trunk/live-helper/helpers/lh_binary_iso
Log:


Modified: dists/trunk/live-helper/Makefile
===================================================================
--- dists/trunk/live-helper/Makefile	2007-05-18 08:34:20 UTC (rev 1541)
+++ dists/trunk/live-helper/Makefile	2007-05-18 08:38:07 UTC (rev 1542)
@@ -5,7 +5,7 @@
 all: build
 
 test:
-	set -e; for SCRIPT in functions/* examples/*.sh helpers/* hooks/*; \
+	set -e; for SCRIPT in functions/* examples/*/*.sh helpers/* hooks/*; \
 	do \
 		sh -n $$SCRIPT; \
 	done

Modified: dists/trunk/live-helper/helpers/lh_binary_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_iso	2007-05-18 08:34:20 UTC (rev 1541)
+++ dists/trunk/live-helper/helpers/lh_binary_iso	2007-05-18 08:38:07 UTC (rev 1542)
@@ -79,8 +79,10 @@
 					;;
 
 				syslinux)
+					cp chroot/binary/isolinux/isolinux.bin chroot
 					#Chroot "${LH_GENISOIMAGE} -A \"Debian Live\" -p \"Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org\" -publisher \"Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org\" -o binary.iso -r -J -l -V \"${LIVE_ISO_VOLUME}\" -cache-inodes -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table binary"
-					Chroot "${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -r -J -l -cache-inodes -b isolinux/isolinux.bin -m isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table binary"
+					Chroot "${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -r -J -l -cache-inodes -b /isolinux.bin -m isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table binary"
+					rm -f chroot/isolinux.bin
 					;;
 			esac
 		else