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

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-06-16 14:30:34 +0000 (Sat, 16 Jun 2007)
New Revision: 2123

Modified:
   dists/trunk/live-helper/helpers/lh_binary_grub
   dists/trunk/live-helper/helpers/lh_binary_live-installer
   dists/trunk/live-helper/helpers/lh_binary_syslinux
   dists/trunk/live-helper/helpers/lh_binary_yaboot
Log:


Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub	2007-06-16 14:12:11 UTC (rev 2122)
+++ dists/trunk/live-helper/helpers/lh_binary_grub	2007-06-16 14:30:34 UTC (rev 2123)
@@ -194,7 +194,7 @@
 LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
 
 # Assembling debian-installer configuration
-if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
+if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ] || [ "${LIVE_LIVE_INSTALLER}" = "enabled" ]
 then
 	LINUX="title\t\tLive:\nroot\n\n${LINUX}"
 

Modified: dists/trunk/live-helper/helpers/lh_binary_live-installer
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_live-installer	2007-06-16 14:12:11 UTC (rev 2122)
+++ dists/trunk/live-helper/helpers/lh_binary_live-installer	2007-06-16 14:30:34 UTC (rev 2123)
@@ -279,7 +279,7 @@
 		mkdir -p pool/main/"${LETTER}"/"${SOURCE}"
 
 		# Move files
-		mv "${FILE}" pool/main/"${LETTER}"/"${SOURCE}"
+		cp "${FILE}" pool/main/"${LETTER}"/"${SOURCE}"
 	done
 fi
 

Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-06-16 14:12:11 UTC (rev 2122)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-06-16 14:30:34 UTC (rev 2123)
@@ -233,7 +233,7 @@
 LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
 
 # Assembling debian-installer configuration
-if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
+if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ] || [ "${LIVE_LIVE_INSTALLER}" = "enabled" ]
 then
 	VMLINUZ_DI="vmlinuz"
 	INITRD_DI="initrd.gz"

Modified: dists/trunk/live-helper/helpers/lh_binary_yaboot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-06-16 14:12:11 UTC (rev 2122)
+++ dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-06-16 14:30:34 UTC (rev 2123)
@@ -202,7 +202,7 @@
 LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
 
 # Assembling debian-installer configuration
-if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
+if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ] || [ "${LIVE_LIVE_INSTALLER}" = "enabled" ]
 then
 	VMLINUZ_DI="vmlinuz"
 	INITRD_DI="initrd.gz"