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/source_disk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/build/source_disk') 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 -- cgit v1.2.3