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

[matth-guest at alioth.debian.org]

Author: matth-guest
Date: 2007-07-02 06:28:10 +0000 (Mon, 02 Jul 2007)
New Revision: 2342

Modified:
   dists/trunk/live-helper/helpers/lh_binary_disk
   dists/trunk/live-helper/helpers/lh_binary_grub
   dists/trunk/live-helper/helpers/lh_binary_includes
   dists/trunk/live-helper/helpers/lh_binary_syslinux
   dists/trunk/live-helper/helpers/lh_binary_yaboot
Log:
adapt LIVE_DEBIAN_INSTALLER "enabled" test now that it can have other values


Modified: dists/trunk/live-helper/helpers/lh_binary_disk
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_disk	2007-07-01 23:42:16 UTC (rev 2341)
+++ dists/trunk/live-helper/helpers/lh_binary_disk	2007-07-02 06:28:10 UTC (rev 2342)
@@ -81,7 +81,7 @@
 		;;
 esac
 
-if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
+if [ ! -z "${LIVE_DEBIAN_INSTALLER}" -a "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
 then
 	echo "main" > binary/.disk/base_components
 

Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub	2007-07-01 23:42:16 UTC (rev 2341)
+++ dists/trunk/live-helper/helpers/lh_binary_grub	2007-07-02 06:28:10 UTC (rev 2342)
@@ -190,7 +190,7 @@
 LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
 
 # Assembling debian-installer configuration
-if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
+if [ ! -z "${LIVE_DEBIAN_INSTALLER}" -a "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
 then
 	LINUX="title\t\tLive:\nroot\n\n${LINUX}"
 

Modified: dists/trunk/live-helper/helpers/lh_binary_includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_includes	2007-07-01 23:42:16 UTC (rev 2341)
+++ dists/trunk/live-helper/helpers/lh_binary_includes	2007-07-02 06:28:10 UTC (rev 2342)
@@ -117,7 +117,7 @@
 fi
 
 
-if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
+if [ ! -z "${LIVE_DEBIAN_INSTALLER}" -a "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
 then
 	# Copying install templates
 	if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install ] && \

Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-07-01 23:42:16 UTC (rev 2341)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-07-02 06:28:10 UTC (rev 2342)
@@ -254,7 +254,7 @@
 LINUX_LIVE="`echo ${LINUX_LIVE} | sed -e 's/binary//g' -e 's#//#/#g'`"
 
 # Assembling debian-installer configuration
-if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
+if [ ! -z "${LIVE_DEBIAN_INSTALLER}" -a "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
 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-07-01 23:42:16 UTC (rev 2341)
+++ dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-07-02 06:28:10 UTC (rev 2342)
@@ -189,7 +189,7 @@
 LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
 
 # Assembling debian-installer configuration
-if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
+if [ ! -z "${LIVE_DEBIAN_INSTALLER}" -a "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
 then
 	VMLINUZ_DI="vmlinuz"
 	INITRD_DI="initrd.gz"