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

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-06-13 12:38:44 +0000 (Wed, 13 Jun 2007)
New Revision: 2072

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


Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-06-13 12:13:15 UTC (rev 2071)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-06-13 12:38:44 UTC (rev 2072)
@@ -5,8 +5,6 @@
 	    migrate into testing.
 	* helpers/lh_bootstrap_cache, lh_chroot_cache:
 	  - Fixed typos which made caching fail on rebuilds.
-	* helpers/lh_binary_iso:
-	  - Enabling Rock-Ride only when using plain chroot filesystem.
 	* helpers/lh_clean:
 	  - Added unmount of binfmt on clean.
 

Modified: dists/trunk/live-helper/docs/TODO
===================================================================
--- dists/trunk/live-helper/docs/TODO	2007-06-13 12:13:15 UTC (rev 2071)
+++ dists/trunk/live-helper/docs/TODO	2007-06-13 12:38:44 UTC (rev 2072)
@@ -16,6 +16,7 @@
   * multi-{binary,architecture,distribution} builds in one shot
   * check unset variables
   * add lilo support? :)
+  * set default live-entry to Live:, default install-entry to Install: in menu.lst.
 
 ADDME
   * vmlinu[xz] [ppc64?]

Modified: dists/trunk/live-helper/helpers/lh_binary_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_iso	2007-06-13 12:13:15 UTC (rev 2071)
+++ dists/trunk/live-helper/helpers/lh_binary_iso	2007-06-13 12:38:44 UTC (rev 2072)
@@ -88,11 +88,6 @@
 	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LIVE_ISO_VOLUME}\""
 fi
 
-if [ "${LIVE_CHROOT_FILESYSTEM}" = "plain" ]
-then
-	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r"
-fi
-
 # Moving image
 mv binary chroot
 
@@ -100,7 +95,7 @@
 case "${LIVE_BOOTLOADER}" in
 	grub)
 		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
-		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -b boot/grub/stage2_eltorito"
+		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b boot/grub/stage2_eltorito"
 
 		if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
 		then