manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Daniel Baumann 2008-08-10 04:29:40 +02:00
parent 6bb9881da9
commit e74a26afdb
3 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
functions/defaults.sh
View File

@ -538,9 +538,6 @@ Set_defaults ()
# Setting debian-installer option # Setting debian-installer option
LH_DEBIAN_INSTALLER="${LH_DEBIAN_INSTALLER:-disabled}" 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 # Setting debian-installer distribution
LH_DEBIAN_INSTALLER_DISTRIBUTION="${LH_DEBIAN_INSTALLER_DISTRIBUTION:-${LH_DISTRIBUTION}}" LH_DEBIAN_INSTALLER_DISTRIBUTION="${LH_DEBIAN_INSTALLER_DISTRIBUTION:-${LH_DISTRIBUTION}}"

2
helpers/lh_binary_debian-installer
View File

@ -248,7 +248,7 @@ then
esac esac
fi fi
if [ "${LH_DEBIAN_INSTALLER_DAILY}" = "enabled" ] if [ "${LH_DEBIAN_INSTALLER_DISTRIBUTION}" = "daily" ]
then then
# Debian Installer daily builds # Debian Installer daily builds
case "${LH_ARCHITECTURE}" in case "${LH_ARCHITECTURE}" in

12
helpers/lh_config
View File

@ -54,8 +54,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--debconf-nowarnings enabled|disabled]\n\ \t [--debconf-nowarnings enabled|disabled]\n\
\t [--debconf-priority low|medium|high|critical]\n\ \t [--debconf-priority low|medium|high|critical]\n\
\t [--debian-installer enabled|cdrom|netinst|netboot|businesscard|live|disabled]\n\ \t [--debian-installer enabled|cdrom|netinst|netboot|businesscard|live|disabled]\n\
\t [--debian-installer-daily enabled|disabled]\n\ \t [--debian-installer-distribution CODENAME|daily]\n\
\t [--debian-installer-distribution CODENAME]\n\
\t [--debug]\n\ \t [--debug]\n\
\t [-d|--distribution CODENAME]\n\ \t [-d|--distribution CODENAME]\n\
\t [-e|--encryption disabled|aes128|aes192|aes256]\n\ \t [-e|--encryption disabled|aes128|aes192|aes256]\n\
@ -470,11 +469,6 @@ Local_arguments ()
shift 2 shift 2
;; ;;
--debian-installer-daily)
LH_DEBIAN_INSTALLER_DAILY="${2}"
shift 2
;;
--debian-installer-distribution) --debian-installer-distribution)
LH_DEBIAN_INSTALLER_DISTRIBUTION="${2}" LH_DEBIAN_INSTALLER_DISTRIBUTION="${2}"
shift 2 shift 2
@ -1001,10 +995,6 @@ LH_CHROOT_BUILD="${LH_CHROOT_BUILD}"
# (Default: ${LH_DEBIAN_INSTALLER}) # (Default: ${LH_DEBIAN_INSTALLER})
LH_DEBIAN_INSTALLER="${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 # \$LH_DEBIAN_INSTALLER_DISTRIBUTION: set debian-installer suite
# (Default: empty) # (Default: empty)
LH_DEBIAN_INSTALLER_DISTRIBUTION="${LH_DEBIAN_INSTALLER_DISTRIBUTION}" LH_DEBIAN_INSTALLER_DISTRIBUTION="${LH_DEBIAN_INSTALLER_DISTRIBUTION}"