diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-28 02:21:36 +0000 |
|---|---|---|
| committer | Lyndon Brown <jnqnfe@gmail.com> | 2020-04-23 11:52:04 +0100 |
| commit | f73797158e631d9fa2d4c9994e2feff542a7501b (patch) | |
| tree | c977bc05f20d3ace1df3166fd904ac288f2c1611 /scripts/build/binary_iso | |
| parent | ae9143141d460ffbbe6084209977653cdc375bdb (diff) | |
| download | vyos-live-build-f73797158e631d9fa2d4c9994e2feff542a7501b.tar.gz vyos-live-build-f73797158e631d9fa2d4c9994e2feff542a7501b.zip | |
bootloaders: improve bootloader list handling
two parts of the code worked with both comma and space separated lists,
while two others only worked with comma separated.
swapping out commas with spaces when we setup the var in
Set_config_defaults() means that individual scripts no longer need to worry
about it and everything supports both; and that we can avoid the
IFS/OLDIFS mess.
Gbp-Dch: Short
Diffstat (limited to 'scripts/build/binary_iso')
| -rwxr-xr-x | scripts/build/binary_iso | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso index eef752f80..9f1b11a86 100755 --- a/scripts/build/binary_iso +++ b/scripts/build/binary_iso @@ -104,8 +104,6 @@ fi # Set an explicit modification date XORRISO_OPTIONS="${XORRISO_OPTIONS} --modification-date=$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m%d%H%m%S00)" -OLDIFS="$IFS" -IFS="," BOOTLOADER_NUMBER=0 for BOOTLOADER in ${LB_BOOTLOADERS} do @@ -156,7 +154,6 @@ do esac done -IFS="$OLDIFS" #if [ "${LB_DEBIAN_INSTALLER}" != "live" ] #then |