simplify --debian-installer choices

`false` and `none` make no sense as choices for this option. Here we
replace `false` with `none`, and remove `true`.

Note that `true` was treated as an alias for netinst (see the changes to
source_disk and and binary_disk).

For backwards compatibility we still allow `true` and `false` by converting
them to `netinst` and `none` respectively, whilst printing a warning to
encourage users to move to `netinst`/`none`.

Gbp-Dch: Short
Closes: #952864

8 files changed, 11 insertions, 11 deletions

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