[SCM] debian-live branch, master, updated. 1.0_a48-1-98-gea96223

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 0dec585a1481b492376a695a7e61de43ddabd6ac
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Aug 10 04:29:40 2008 +0200

    Merging debian-installer-daily option into debian-installer-distribution.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index a8f79e6..1add262 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -538,9 +538,6 @@ Set_defaults ()
 	# Setting debian-installer option
 	LH_DEBIAN_INSTALLER="${LH_DEBIAN_INSTALLER:-disabled}"
 
-	# Setting debian-install daily images
-	LH_DEBIAN_INSTALLER_DAILY="${LH_DEBIAN_INSTALLER_DAILY:-disabled}"
-
 	# Setting debian-installer distribution
 	LH_DEBIAN_INSTALLER_DISTRIBUTION="${LH_DEBIAN_INSTALLER_DISTRIBUTION:-${LH_DISTRIBUTION}}"
 
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 10a721e..3819597 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -248,7 +248,7 @@ then
 	esac
 fi
 
-if [ "${LH_DEBIAN_INSTALLER_DAILY}" = "enabled" ]
+if [ "${LH_DEBIAN_INSTALLER_DISTRIBUTION}" = "daily" ]
 then
 	# Debian Installer daily builds
 	case "${LH_ARCHITECTURE}" in
diff --git a/helpers/lh_config b/helpers/lh_config
index 8eadb64..7dbcd24 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -54,8 +54,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
 \t    [--debconf-nowarnings enabled|disabled]\n\
 \t    [--debconf-priority low|medium|high|critical]\n\
 \t    [--debian-installer enabled|cdrom|netinst|netboot|businesscard|live|disabled]\n\
-\t    [--debian-installer-daily enabled|disabled]\n\
-\t    [--debian-installer-distribution CODENAME]\n\
+\t    [--debian-installer-distribution CODENAME|daily]\n\
 \t    [--debug]\n\
 \t    [-d|--distribution CODENAME]\n\
 \t    [-e|--encryption disabled|aes128|aes192|aes256]\n\
@@ -470,11 +469,6 @@ Local_arguments ()
 				shift 2
 				;;
 
-			--debian-installer-daily)
-				LH_DEBIAN_INSTALLER_DAILY="${2}"
-				shift 2
-				;;
-
 			--debian-installer-distribution)
 				LH_DEBIAN_INSTALLER_DISTRIBUTION="${2}"
 				shift 2
@@ -1001,10 +995,6 @@ LH_CHROOT_BUILD="${LH_CHROOT_BUILD}"
 # (Default: ${LH_DEBIAN_INSTALLER})
 LH_DEBIAN_INSTALLER="${LH_DEBIAN_INSTALLER}"
 
-# \$LH_DEBIAN_INSTALLER_DAILY: set daily images
-# (Default: ${LH_DEBIAN_INSTALLER_DAILY})
-LH_DEBIAN_INSTALLER_DAILY="${LH_DEBIAN_INSTALLER_DAILY}"
-
 # \$LH_DEBIAN_INSTALLER_DISTRIBUTION: set debian-installer suite
 # (Default: empty)
 LH_DEBIAN_INSTALLER_DISTRIBUTION="${LH_DEBIAN_INSTALLER_DISTRIBUTION}"

-- 
debian-live