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

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-07-20 05:08:54 +0000 (Fri, 20 Jul 2007)
New Revision: 2541

Modified:
   dists/trunk/live-helper/debian/control
   dists/trunk/live-helper/docs/ChangeLog
   dists/trunk/live-helper/helpers/lh_binary
   dists/trunk/live-helper/helpers/lh_binary_memtest
Log:


Modified: dists/trunk/live-helper/debian/control
===================================================================
--- dists/trunk/live-helper/debian/control	2007-07-20 04:57:33 UTC (rev 2540)
+++ dists/trunk/live-helper/debian/control	2007-07-20 05:08:54 UTC (rev 2541)
@@ -11,7 +11,7 @@
 Package: live-helper
 Architecture: all
 Depends: cdebootstrap (>= 0.3.15) | debootstrap (>= 0.3.3.2)
-Suggests: genisoimage, grub [amd64 i386], squashfs-tools, syslinux [amd64 i386]
+Suggests: genisoimage | mkisofs, memtest86+ [i386] | memtest86, squashfs-tools, syslinux [i386] | grub [i386]
 Conflicts: live-package
 Replaces: live-package
 Provides: make-live

Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-07-20 04:57:33 UTC (rev 2540)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-07-20 05:08:54 UTC (rev 2541)
@@ -6,8 +6,7 @@
 	* helpers/lh_binary_syslinux:
 	  - Using etch workaround for long filenames in syslinux on all
 	    distributions.
-	* functions/defaults.sh, package.sh, helpers/lh_config,
-	  lh_binary_rootfs, lh_binary_encryption, lh_binary_chroot:
+	* functions/defaults.sh, package.sh, helpers/lh_config, lh_binary_*:
 	  - Added support for non-chrooted build.
 	* helpers/lh_binary_rootfs:
 	  - Updated squashfs-tools package check.

Modified: dists/trunk/live-helper/helpers/lh_binary
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary	2007-07-20 04:57:33 UTC (rev 2540)
+++ dists/trunk/live-helper/helpers/lh_binary	2007-07-20 05:08:54 UTC (rev 2541)
@@ -27,13 +27,16 @@
 # Preparing root filesystem
 lh_binary_chroot ${*}
 
-# Configuring chroot
-lh_chroot_proc install ${*}
-lh_chroot_sysfs install ${*}
-lh_chroot_hosts install ${*}
-lh_chroot_resolv install ${*}
-lh_chroot_hostname install ${*}
-lh_chroot_sources install ${*}
+if [ "${LH_CHROOT_BUILD}" = "enabled" ]
+then
+	# Configuring chroot
+	lh_chroot_proc install ${*}
+	lh_chroot_sysfs install ${*}
+	lh_chroot_hosts install ${*}
+	lh_chroot_resolv install ${*}
+	lh_chroot_hostname install ${*}
+	lh_chroot_sources install ${*}
+fi
 
 # Building root filesystem
 lh_binary_rootfs ${*}
@@ -59,10 +62,13 @@
 lh_binary_tar ${*}
 lh_binary_usb-hdd ${*}
 
-# Deconfiguring chroot
-rm -f .stage/chroot_sources
-lh_chroot_hostname remove ${*}
-lh_chroot_resolv remove ${*}
-lh_chroot_hosts remove ${*}
-lh_chroot_sysfs remove ${*}
-lh_chroot_proc remove ${*}
+if [ "${LH_CHROOT_BUILD}" = "enabled" ]
+then
+	# Deconfiguring chroot
+	rm -f .stage/chroot_sources
+	lh_chroot_hostname remove ${*}
+	lh_chroot_resolv remove ${*}
+	lh_chroot_hosts remove ${*}
+	lh_chroot_sysfs remove ${*}
+	lh_chroot_proc remove ${*}
+fi

Modified: dists/trunk/live-helper/helpers/lh_binary_memtest
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_memtest	2007-07-20 04:57:33 UTC (rev 2540)
+++ dists/trunk/live-helper/helpers/lh_binary_memtest	2007-07-20 05:08:54 UTC (rev 2541)
@@ -127,11 +127,11 @@
 # Installing memtest
 case "${LH_CHROOT_BUILD}" in
 	enabled)
-		cp chroot/boot/${LH_MEMTEST} "${DESTDIR}"/memtest
+		cp chroot/boot/${LIVE_MEMTEST}.bin "${DESTDIR}"/memtest
 		;;
 
 	disabled)
-		cp /boot/${LH_MEMTEST} "${DESTDIR}"/memtest
+		cp /boot/${LIVE_MEMTEST}.bin "${DESTDIR}"/memtest
 		;;
 esac