From fcafaede192e150daaf61591aef57edf3c2983fc Mon Sep 17 00:00:00 2001 From: jnqnfe Date: Mon, 5 Jan 2015 16:53:53 +0000 Subject: 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 --- scripts/build/binary_grub-legacy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/build/binary_grub-legacy') 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" -- cgit v1.2.3