diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-19 01:39:28 +0000 |
|---|---|---|
| committer | Luca Boccassi <bluca@debian.org> | 2020-03-20 10:19:33 +0000 |
| commit | c534ff52a4c619e7cba4f6e473e60b7440355019 (patch) | |
| tree | c1912abaa9a53e24e06fab33fb8de5f589d3d4c1 /functions/defaults.sh | |
| parent | 2c14566c69b2ab60d21424ab76bbda53acce6bcf (diff) | |
| download | vyos-live-build-c534ff52a4c619e7cba4f6e473e60b7440355019.tar.gz vyos-live-build-c534ff52a4c619e7cba4f6e473e60b7440355019.zip | |
defaults: ensure labels have defaults for derivatives
Diffstat (limited to 'functions/defaults.sh')
| -rwxr-xr-x | functions/defaults.sh | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index fd9129ed5..391f65474 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -477,11 +477,7 @@ Set_config_defaults () LB_BOOTAPPEND_INSTALL="$(echo ${LB_BOOTAPPEND_INSTALL} | sed -e 's/[ \t]*$//')" # Setting iso author - case "${LB_MODE}" in - debian) - LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Debian Live}" - ;; - esac + LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Debian Live}" # Set iso preparer LB_ISO_PREPARER="${LB_ISO_PREPARER:-live-build \$VERSION; https://salsa.debian.org/live-team/live-build}" @@ -490,21 +486,13 @@ Set_config_defaults () LB_ISO_PUBLISHER="${LB_ISO_PUBLISHER:-Debian Live project; https://wiki.debian.org/DebianLive; debian-live@lists.debian.org}" # Setting hdd options - case "${LB_MODE}" in - debian) - LB_HDD_LABEL="${LB_HDD_LABEL:-DEBIAN_LIVE}" - ;; - esac + LB_HDD_LABEL="${LB_HDD_LABEL:-DEBIAN_LIVE}" # Setting hdd size LB_HDD_SIZE="${LB_HDD_SIZE:-auto}" # Setting iso volume - case "${LB_MODE}" in - debian) - LB_ISO_VOLUME="${LB_ISO_VOLUME:-Debian ${LB_DISTRIBUTION} \$(date +%Y%m%d-%H:%M)}" - ;; - esac + LB_ISO_VOLUME="${LB_ISO_VOLUME:-Debian ${LB_DISTRIBUTION} \$(date +%Y%m%d-%H:%M)}" # Setting memtest option LB_MEMTEST="${LB_MEMTEST:-none}" |