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

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-07-20 04:53:09 +0000 (Fri, 20 Jul 2007)
New Revision: 2538

Modified:
   dists/trunk/live-helper/docs/ChangeLog
   dists/trunk/live-helper/helpers/lh_binary_memtest
   dists/trunk/live-helper/helpers/lh_binary_syslinux
Log:


Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-07-19 22:12:50 UTC (rev 2537)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-07-20 04:53:09 UTC (rev 2538)
@@ -8,7 +8,7 @@
 	    distributions.
 	* functions/defaults.sh, package.sh, helpers/lh_config,
 	  lh_binary_rootfs, lh_binary_encryption, lh_binary_chroot:
-	  - Partially implemented support for non-chrooted build.
+	  - Added support for non-chrooted build.
 	* helpers/lh_binary_rootfs:
 	  - Updated squashfs-tools package check.
 

Modified: dists/trunk/live-helper/helpers/lh_binary_memtest
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_memtest	2007-07-19 22:12:50 UTC (rev 2537)
+++ dists/trunk/live-helper/helpers/lh_binary_memtest	2007-07-20 04:53:09 UTC (rev 2538)
@@ -127,11 +127,11 @@
 # Installing memtest
 case "${LH_CHROOT_BUILD}" in
 	enabled)
-		cp -f chroot/boot/${LH_MEMTEST} "${DESTDIR}"/memtest
+		cp chroot/boot/${LH_MEMTEST} "${DESTDIR}"/memtest
 		;;
 
 	disabled)
-		cp -f /boot/${LH_MEMTEST} "${DESTDIR}"/memtest
+		cp /boot/${LH_MEMTEST} "${DESTDIR}"/memtest
 		;;
 esac
 

Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-07-19 22:12:50 UTC (rev 2537)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-07-20 04:53:09 UTC (rev 2538)
@@ -320,7 +320,17 @@
 	iso)
 		# Copying syslinux
 		mkdir -p binary/isolinux
-		cp chroot/usr/lib/syslinux/isolinux.bin binary/isolinux
+
+		case "${LH_CHROOT_BUILD}" in
+			enabled)
+				cp chroot/usr/lib/syslinux/isolinux.bin binary/isolinux
+				;;
+
+			disabled)
+				cp /usr/lib/syslinux/isolinux.bin binary/isolinux
+				;;
+		esac
+
 		cp -r "${TEMPLATES}"/* binary/isolinux
 		mv binary/isolinux/syslinux.cfg binary/isolinux/isolinux.cfg
 
@@ -380,7 +390,18 @@
 
 	net)
 		# Copying syslinux
-		cp chroot/usr/lib/syslinux/pxelinux.0 tftpboot
+		mkdir -p tftpboot
+
+		case "${LH_CHROOT_BUILD}" in
+			enabled)
+				cp chroot/usr/lib/syslinux/pxelinux.0 tftpboot
+				;;
+
+			disabled)
+				cp /usr/lib/syslinux/pxelinux.0 tftpboot
+				;;
+		esac
+
 		mkdir -p tftpboot/pxelinux.cfg
 		cp -r "${TEMPLATES}"/* tftpboot/pxelinux.cfg
 		mv tftpboot/pxelinux.cfg/syslinux.cfg tftpboot/pxelinux.cfg/default
@@ -439,7 +460,17 @@
 
 		# Copying syslinux
 		mkdir -p "${DESTDIR}"
-		cp chroot/usr/lib/syslinux/isolinux.bin "${DESTDIR}"/syslinux.bin
+
+		case "${LH_CHROOT_BUILD}" in
+			enabled)
+				cp chroot/usr/lib/syslinux/isolinux.bin "${DESTDIR}"/syslinux.bin
+				;;
+
+			disabled)
+				cp /usr/lib/syslinux/isolinux.bin "${DESTDIR}"/syslinux.bin
+				;;
+		esac
+
 		cp -r "${TEMPLATES}"/* "${DESTDIR}"
 
 		# Copying local configuration file