summaryrefslogtreecommitdiff
path: root/scripts/build/binary_loopback_cfg
diff options
context:
space:
mode:
authorjnqnfe <jnqnfe@gmail.com>2015-01-05 16:53:53 +0000
committerRaphaƫl Hertzog <hertzog@debian.org>2020-03-05 11:36:55 +0000
commitfcafaede192e150daaf61591aef57edf3c2983fc (patch)
tree72132cd41973c1bf57bc3498ff8f0d20dc4a959b /scripts/build/binary_loopback_cfg
parent6002f89b67424a36f9e6bacdef260df0a0683b74 (diff)
downloadvyos-live-build-fcafaede192e150daaf61591aef57edf3c2983fc.tar.gz
vyos-live-build-fcafaede192e150daaf61591aef57edf3c2983fc.zip
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
Diffstat (limited to 'scripts/build/binary_loopback_cfg')
-rwxr-xr-xscripts/build/binary_loopback_cfg2
1 files changed, 1 insertions, 1 deletions
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"