summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2008-08-10 04:29:40 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:38 +0100
commitba25e433b5bbddb9f22071aa74773dcfac97f521 (patch)
tree14a5fc0906201740587d426cd532394d6a6d1d35
parent17ca582c930474093e71084d3e418ab665cdfaf7 (diff)
downloadvyos-live-build-ba25e433b5bbddb9f22071aa74773dcfac97f521.tar.gz
vyos-live-build-ba25e433b5bbddb9f22071aa74773dcfac97f521.zip
Merging debian-installer-daily option into debian-installer-distribution.
-rwxr-xr-xfunctions/defaults.sh3
-rwxr-xr-xhelpers/lh_binary_debian-installer2
-rwxr-xr-xhelpers/lh_config12
3 files changed, 2 insertions, 15 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index a8f79e665..1add26289 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 10a721e02..38195979d 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 8eadb6410..7dbcd246b 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}"