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

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-24 08:24:20 +0000 (Thu, 24 May 2007)
New Revision: 1659

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


Modified: dists/trunk/live-helper/helpers/lh_binary_encryption
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_encryption	2007-05-24 08:06:30 UTC (rev 1658)
+++ dists/trunk/live-helper/helpers/lh_binary_encryption	2007-05-24 08:24:20 UTC (rev 1659)
@@ -88,7 +88,7 @@
 
 echo "Encrypting binary/${INITFS}/filesystem.${ROOTFS} with ${LIVE_ENCRYPTION}..."
 
-cat >> chroot/encrypt << EOF
+cat >> chroot/encrypt.sh << EOF
 while true
 do
 	cat filesystem.${ROOTFS} | aespipe -e ${LIVE_ENCRYPTION} -T > filesystem.${ROOTFS}.tmp && mv filesystem.${ROOTFS}.tmp filesystem.${ROOTFS} && break
@@ -105,11 +105,11 @@
 done
 EOF
 
-Chroot "sh encrypt"
+Chroot "sh encrypt.sh"
 
 # Move image
 mv chroot/filesystem.${LIVE_CHROOT_FILESYSTEM} binary/${INITFS}
-rm -f chroot/encrypt
+rm -f chroot/encrypt.sh
 
 # Removing depends
 Remove_package

Modified: dists/trunk/live-helper/helpers/lh_binary_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_iso	2007-05-24 08:06:30 UTC (rev 1658)
+++ dists/trunk/live-helper/helpers/lh_binary_iso	2007-05-24 08:24:20 UTC (rev 1659)
@@ -101,10 +101,15 @@
 			GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
 		fi
 
-		Chroot "${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -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\" -V \"${LIVE_ISO_VOLUME}\" -o binary.iso -r -J -l -cache-inodes binary"
+cat >> chroot/binary.sh << EOF
+${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -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" -V "${LIVE_ISO_VOLUME}" -o binary.iso -r -J -l -cache-inodes binary
+EOF
 
+		Chroot "sh binary.sh"
+
 		# Move image
 		mv chroot/binary chroot/binary.iso ./
+		rm -f chroot/binary.sh
 
 		# Removing depends
 		Remove_package