diff options
| author | Adrian Gibanel Lopez <adrian.gibanel@btactic.com> | 2015-08-21 23:54:46 +0200 |
|---|---|---|
| committer | Adrian Gibanel Lopez <adrian.gibanel@btactic.com> | 2015-08-29 23:56:41 +0200 |
| commit | d515ae56842f9420ff4c629eac18904f7beef2e8 (patch) | |
| tree | 54303ab985d71ee280562b7ed75413c56a63ee93 /scripts/build/config | |
| parent | d43874c405ca468fc72158da6280c6b11755a3e6 (diff) | |
| download | vyos-live-build-d515ae56842f9420ff4c629eac18904f7beef2e8.tar.gz vyos-live-build-d515ae56842f9420ff4c629eac18904f7beef2e8.zip | |
Multi bootloader support
Note: OLDIFS use makes IFS to be reset to "" instead to it being unset.
Either we need to detect if old IFS was unset to unset it
or we need a proper way of setting it as a local variable.
Even more IFS it's not currently used in
Check_package (which it's called from: binary_hdd).
we should have a clean way of resetting/unsetting IFS when calling Check_package.
The other approach it's to explicitly define IFS with its default value in the
places inside live-build code where we implicitly suppose that it's going to have
its default value.
Diffstat (limited to 'scripts/build/config')
| -rwxr-xr-x | scripts/build/config | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/build/config b/scripts/build/config index 66bf64fdd..fbe986588 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -32,7 +32,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--bootappend-install PARAMETER|\"PARAMETERS\"]\n\ \t [--bootappend-live PARAMETER|\"PARAMETERS\"]\n\ \t [--bootappend-live-failsafe PARAMETER|\"PARAMETERS\"]\n\ -\t [--bootloader grub-legacy|grub-pc|syslinux]\n\ +\t [--bootloaders grub-legacy|grub-pc|syslinux]\n\ \t [--cache true|false]\n\ \t [--cache-indices true|false]\n\ \t [--cache-packages true|false]\n\ @@ -137,7 +137,7 @@ Local_arguments () archive-areas:,parent-archive-areas:,chroot-filesystem:, gzip-options:,image-name:,interactive:,keyring-packages:,linux-flavours:,linux-packages:, security:,updates:,backports:,binary-filesystem:,binary-images:, - apt-indices:,bootappend-install:,bootappend-live:,bootappend-live-failsafe:,bootloader:,checksums:,compression:,config:,zsync:,build-with-chroot:, + apt-indices:,bootappend-install:,bootappend-live:,bootappend-live-failsafe:,bootloaders:,checksums:,compression:,config:,zsync:,build-with-chroot:, debian-installer:,debian-installer-distribution:,debian-installer-preseedfile:,debian-installer-gui:, grub-splash:,isohybrid-options:,hdd-label:,hdd-size:,iso-application:,iso-preparer:,iso-publisher:, iso-volume:,jffs2-eraseblock:,memtest:,net-root-filesystem:,net-root-mountoptions:, @@ -491,8 +491,8 @@ Local_arguments () shift 2 ;; - --bootloader) - LB_BOOTLOADER="${2}" + --bootloaders) + LB_BOOTLOADERS="${2}" shift 2 ;; @@ -1149,9 +1149,9 @@ LB_BOOTAPPEND_INSTALL="${LB_BOOTAPPEND_INSTALL}" # (Default: empty) LB_BOOTAPPEND_LIVE_FAILSAFE="${LB_BOOTAPPEND_LIVE_FAILSAFE}" -# \$LB_BOOTLOADER: set bootloader -# (Default: ${LB_BOOTLOADER}) -LB_BOOTLOADER="${LB_BOOTLOADER}" +# \$LB_BOOTLOADERS: set bootloaders +# (Default: ${LB_BOOTLOADERS}) +LB_BOOTLOADERS="${LB_BOOTLOADERS}" # \$LB_CHECKSUMS: set checksums # (Default: ${LB_CHECKSUMS}) |