diff options
| author | jnqnfe <jnqnfe@gmail.com> | 2015-01-05 16:53:53 +0000 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2020-03-05 11:36:55 +0000 |
| commit | fcafaede192e150daaf61591aef57edf3c2983fc (patch) | |
| tree | 72132cd41973c1bf57bc3498ff8f0d20dc4a959b /scripts/build/binary_disk | |
| parent | 6002f89b67424a36f9e6bacdef260df0a0683b74 (diff) | |
| download | vyos-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_disk')
| -rwxr-xr-x | scripts/build/binary_disk | 4 |
1 files changed, 2 insertions, 2 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 |