[Debian-live-changes] r1649 - in dists/trunk/live-helper: docs helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-23 18:27:54 +0000 (Wed, 23 May 2007)
New Revision: 1649

Modified:
   dists/trunk/live-helper/docs/TODO
   dists/trunk/live-helper/helpers/lh_binary_iso
   dists/trunk/live-helper/helpers/lh_source_iso
Log:


Modified: dists/trunk/live-helper/docs/TODO
===================================================================
--- dists/trunk/live-helper/docs/TODO	2007-05-23 16:22:53 UTC (rev 1648)
+++ dists/trunk/live-helper/docs/TODO	2007-05-23 18:27:54 UTC (rev 1649)
@@ -7,7 +7,6 @@
 
 1.0~a10-1:
   * add compat code for old syslinux
-  * mkisofs parameter quoting
 
 1.0~a10-1:
   * reordering content of configuration files

Modified: dists/trunk/live-helper/helpers/lh_binary_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_iso	2007-05-23 16:22:53 UTC (rev 1648)
+++ dists/trunk/live-helper/helpers/lh_binary_iso	2007-05-23 18:27:54 UTC (rev 1649)
@@ -101,8 +101,7 @@
 			GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
 		fi
 
-		#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\" -V \"${LIVE_ISO_VOLUME}\"
-		Chroot "${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -r -J -l -cache-inodes binary"
+		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"
 
 		# Move image
 		mv chroot/binary chroot/binary.iso ./

Modified: dists/trunk/live-helper/helpers/lh_source_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_iso	2007-05-23 16:22:53 UTC (rev 1648)
+++ dists/trunk/live-helper/helpers/lh_source_iso	2007-05-23 18:27:54 UTC (rev 1649)
@@ -32,8 +32,6 @@
 Read_conffile config/source
 Set_defaults
 
-Breakpoint "source_iso: Init"
-
 if [ "${LIVE_SOURCE}" != "enabled" ]
 then
 	exit 0
@@ -43,6 +41,8 @@
 do
 	if [ "${IMAGE}" = "iso" ]
 	then
+		Breakpoint "source_iso: Init"
+
 		# Requiring stage file
 		Require_stagefile .stage/source_debian
 
@@ -55,15 +55,35 @@
 		# Creating lock file
 		Create_lockfile .lock
 
+		# Checking depends
+		Check_package chroot/usr/bin/"${LH_GENISOIMAGE}" ${LH_GENISOIMAGE}
+
+		# Installing depends
+		Install_package
+
 		# Remove old source
 		if [ -f source.iso ]
 		then
 			rm -f source.iso
 		fi
 
+		if [ "${LH_VERBOSE}" = "enabled" ]
+		then
+			GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
+		fi
+
+		# Moving image
+		mv source chroot
+
 		# Create image
-		${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 source.iso -r -J -l -V "${LIVE_DISK_VOLUME}" source
+		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 source.iso -r -J -l -cache-inodes source"
 
+		# Move image
+		mv chroot/source chroot/source.iso ./
+
+		# Removing depends
+		Remove_package
+
 		# Creating stage file
 		Create_stagefile .stage/source_iso
 	fi