diff options
| -rwxr-xr-x | functions/defaults.sh | 18 | ||||
| -rw-r--r-- | manpages/en/lb_config.1 | 4 | ||||
| -rwxr-xr-x | scripts/build/binary_disk | 4 | ||||
| -rwxr-xr-x | scripts/build/binary_grub-legacy | 2 | ||||
| -rwxr-xr-x | scripts/build/binary_loopback_cfg | 2 | ||||
| -rwxr-xr-x | scripts/build/binary_win32-loader | 2 | ||||
| -rwxr-xr-x | scripts/build/config | 2 | ||||
| -rwxr-xr-x | scripts/build/installer_debian-installer | 4 | ||||
| -rwxr-xr-x | scripts/build/installer_preseed | 2 | ||||
| -rwxr-xr-x | scripts/build/source_disk | 4 |
10 files changed, 27 insertions, 17 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 8c91d3b38..1c7831532 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -576,7 +576,17 @@ Set_defaults () LB_BUILD_WITH_TMPFS="${LB_BUILD_WITH_TMPFS:-false}" # Setting debian-installer option - LB_DEBIAN_INSTALLER="${LB_DEBIAN_INSTALLER:-false}" + LB_DEBIAN_INSTALLER="${LB_DEBIAN_INSTALLER:-none}" + if [ "${LB_DEBIAN_INSTALLER}" = "false" ] + then + LB_DEBIAN_INSTALLER="none" + Echo_warning "A value of 'false' for option LB_DEBIAN_INSTALLER is deprecated, please use 'none' in future." + fi + if [ "${LB_DEBIAN_INSTALLER}" = "true" ] + then + LB_DEBIAN_INSTALLER="netinst" + Echo_warning "A value of 'true' for option LB_DEBIAN_INSTALLER is deprecated, please use 'netinst' in future." + fi LB_DEBIAN_INSTALLER_DISTRIBUTION="${LB_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_DISTRIBUTION}}" @@ -715,7 +725,7 @@ Set_defaults () *) case "${LB_ARCHITECTURES}" in amd64|i386) - if [ "${LB_DEBIAN_INSTALLER}" != "false" ] + if [ "${LB_DEBIAN_INSTALLER}" != "none" ] then LB_LOADLIN="${LB_LOADLIN:-true}" else @@ -739,7 +749,7 @@ Set_defaults () *) case "${LB_ARCHITECTURES}" in amd64|i386) - if [ "${LB_DEBIAN_INSTALLER}" != "false" ] + if [ "${LB_DEBIAN_INSTALLER}" != "none" ] then LB_WIN32_LOADER="${LB_WIN32_LOADER:-true}" else @@ -823,7 +833,7 @@ Check_defaults () exit 1 fi - if [ "${LB_DEBIAN_INSTALLER}" != "false" ] + if [ "${LB_DEBIAN_INSTALLER}" != "none" ] then # d-i true, no caching if ! echo ${LB_CACHE_STAGES} | grep -qs "bootstrap\b" || [ "${LB_CACHE}" != "true" ] || [ "${LB_CACHE_PACKAGES}" != "true" ] diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1 index 1521c7ce6..50d2d3d02 100644 --- a/manpages/en/lb_config.1 +++ b/manpages/en/lb_config.1 @@ -82,7 +82,7 @@ .br [\fB\-\-debconf\-priority\fR low|medium|high|critical] .br - [\fB\-\-debian\-installer\fR true|cdrom|netinst|netboot|businesscard|live|false] + [\fB\-\-debian\-installer\fR cdrom|netinst|netboot|businesscard|live|none] .br [\fB\-\-debian\-installer\-distribution\fR daily|\fICODENAME\fR] .br @@ -327,7 +327,7 @@ bootstraps the config tree from a git repository, optionally appended by a Git I defines what value the debconf frontend should be set to inside the chroot. Note that setting it to anything but noninteractive, which is the default, makes your build asking questions during the build. .IP "\fB\-\-debconf\-priority\fR low|medium|high|critical" 4 defines what value the debconf priority should be set to inside the chroot. By default, it is set to critical, which means that almost no questions are displayed. Note that this only has an effect if you use any debconf frontend different from noninteractive. -.IP "\fB\-\-debian\-installer\fR true|cdrom|netinst|netboot|businesscard|live|false" 4 +.IP "\fB\-\-debian\-installer\fR cdrom|netinst|netboot|businesscard|live|none" 4 defines which type, if any, of the debian\-installer should be included in the resulting binary image. By default, no installer is included. All available flavours except live are the identical configurations used on the installer media produced by regular debian\-cd. When live is chosen, the live\-installer udeb is included so that debian\-installer will behave different than usual \- instead of installing the debian system from packages from the medium or the network, it installs the live system to the disk. .IP "\fB\-\-debian\-installer\-distribution\fR daily|\fICODENAME\fR" 4 defines the distribution where the debian\-installer files should be taken out from. Normally, this should be set to the same distribution as the live system. However, sometimes, one wants to use a newer or even daily built installer. diff --git a/scripts/build/binary_disk b/scripts/build/binary_disk index 692e31d79..aebca2a0e 100755 --- a/scripts/build/binary_disk +++ b/scripts/build/binary_disk @@ -118,7 +118,7 @@ case "${LB_DEBIAN_INSTALLER}" in done ;; - true|netinst|live) + netinst|live) echo "main" > binary/.disk/base_components touch binary/.disk/base_installable @@ -171,7 +171,7 @@ case "${LB_DEBIAN_INSTALLER}" in done ;; - false) + none) echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info ;; esac diff --git a/scripts/build/binary_grub-legacy b/scripts/build/binary_grub-legacy index 749db8bb3..de0a757ea 100755 --- a/scripts/build/binary_grub-legacy +++ b/scripts/build/binary_grub-legacy @@ -202,7 +202,7 @@ done LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's|binary||g' -e 's|//|/|g')" # Assembling debian-installer configuration -if [ "${LB_DEBIAN_INSTALLER}" != "false" ] +if [ "${LB_DEBIAN_INSTALLER}" != "none" ] then LINUX_LIVE="title\t\tLive:\nroot\n\n${LINUX_LIVE}" LINUX_INSTALL="title\t\tInstaller:\nroot" diff --git a/scripts/build/binary_loopback_cfg b/scripts/build/binary_loopback_cfg index a31cc857e..a390057b3 100755 --- a/scripts/build/binary_loopback_cfg +++ b/scripts/build/binary_loopback_cfg @@ -237,7 +237,7 @@ if [ $_COUNT -gt 1 ]; then fi # Assembling debian-installer configuration -if [ "${LB_DEBIAN_INSTALLER}" != "false" ] +if [ "${LB_DEBIAN_INSTALLER}" != "none" ] then KERNEL_DI="/install/vmlinuz" INITRD_DI="/install/initrd.gz" diff --git a/scripts/build/binary_win32-loader b/scripts/build/binary_win32-loader index 710587283..6198b3828 100755 --- a/scripts/build/binary_win32-loader +++ b/scripts/build/binary_win32-loader @@ -88,7 +88,7 @@ PictureFiles=false VideoFiles=false EOF - if [ "${LB_DEBIAN_INSTALLER}" != "false" ] + if [ "${LB_DEBIAN_INSTALLER}" != "none" ] then cat > binary/win32-loader.ini << EOF diff --git a/scripts/build/config b/scripts/build/config index e9328d5a6..dea361809 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -53,7 +53,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--config GIT_URL::GIT_BRANCH]\n\ \t [--debconf-frontend dialog|editor|noninteractive|readline]\n\ \t [--debconf-priority low|medium|high|critical]\n\ -\t [--debian-installer true|cdrom|netinst|netboot|businesscard|live|false]\n\ +\t [--debian-installer cdrom|netinst|netboot|businesscard|live|none]\n\ \t [--debian-installer-distribution daily|CODENAME]\n\ \t [--debian-installer-gui true|false]\n\ \t [--debian-installer-preseedfile FILE|URL]\n\ diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer index 1f3cf7574..9f173af5d 100755 --- a/scripts/build/installer_debian-installer +++ b/scripts/build/installer_debian-installer @@ -36,10 +36,10 @@ fi # Check d-i configuration case "${LB_DEBIAN_INSTALLER}" in - true|cdrom|netinst|netboot|businesscard|live) + cdrom|netinst|netboot|businesscard|live) ;; - false) + none) exit 0 ;; diff --git a/scripts/build/installer_preseed b/scripts/build/installer_preseed index 798c6ae68..8a29ac0a6 100755 --- a/scripts/build/installer_preseed +++ b/scripts/build/installer_preseed @@ -27,7 +27,7 @@ Set_defaults # Check d-i configuration case "${LB_DEBIAN_INSTALLER}" in - false) + none) exit 0 ;; esac diff --git a/scripts/build/source_disk b/scripts/build/source_disk index 4381322cd..3610da35a 100755 --- a/scripts/build/source_disk +++ b/scripts/build/source_disk @@ -102,7 +102,7 @@ case "${LB_DEBIAN_INSTALLER}" in echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/CD Source $(date +%Y%m%d-%H:%M)" > source/.disk/info ;; - true|netinst) + netinst) echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/NETINST Source $(date +%Y%m%d-%H:%M)" > source/.disk/info ;; @@ -118,7 +118,7 @@ case "${LB_DEBIAN_INSTALLER}" in echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/BC Source $(date +%Y%m%d-%H:%M)" > source/.disk/info ;; - false) + none) echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE Source $(date +%Y%m%d-%H:%M)" > source/.disk/info ;; esac |