summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-10-08 19:51:23 +0200
committerDaniel Baumann <daniel@debian.org>2012-10-08 19:51:23 +0200
commit65bc289e9bf1dcc1650371a789d9738b68671255 (patch)
tree743d8eea7c5b414a453e659bce8cf0c84d257deb
parentbf918b85846d1b7c369253c0c70a8a153eb9528d (diff)
downloadvyos-live-build-65bc289e9bf1dcc1650371a789d9738b68671255.tar.gz
vyos-live-build-65bc289e9bf1dcc1650371a789d9738b68671255.zip
Correcting variable handling for --bootappend-live-failsafe in lb config.
-rwxr-xr-xscripts/build/config16
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/build/config b/scripts/build/config
index 6115ec2f7..2b30f7ace 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -31,7 +31,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--binary-filesystem fat16|fat32|ext2|ext3|ext4|ntfs]\n\
\t [--bootappend-install PARAMETER|\"PARAMETERS\"]\n\
\t [--bootappend-live PARAMETER|\"PARAMETERS\"]\n\
-\t [--bootappend-failsafe PARAMETER|\"PARAMETERS\"]\n\
+\t [--bootappend-live-failsafe PARAMETER|\"PARAMETERS\"]\n\
\t [--bootloader grub|syslinux|yaboot]\n\
\t [--bootstrap cdebootstrap|cdebootstrap-static|debootstrap]\n\
\t [--cache true|false]\n\
@@ -153,7 +153,7 @@ Local_arguments ()
archives:,archive-areas:,parent-archive-areas:,chroot-filesystem:,exposed-root:,
gzip-options:,hooks:,interactive:,keyring-packages:,linux-flavours:,linux-packages:,
security:,updates:,backports:,binary-filesystem:,binary-images:,
- apt-indices:,bootappend-install:,bootappend-live:,bootappend-failsafe:,bootloader:,checksums:,compression:,config:,zsync:,build-with-chroot:,
+ apt-indices:,bootappend-install:,bootappend-live:,bootappend-live-failsafe:,bootloader:,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:,
@@ -577,13 +577,13 @@ Local_arguments ()
shift 2
;;
- --bootappend-install)
- LB_BOOTAPPEND_INSTALL="${2}"
+ --bootappend-live-failsafe)
+ LB_BOOTAPPEND_LIVE_FAILSAFE="${2}"
shift 2
;;
- --bootappend-failsafe)
- LB_BOOTAPPEND_FAILSAFE="${2}"
+ --bootappend-install)
+ LB_BOOTAPPEND_INSTALL="${2}"
shift 2
;;
@@ -1313,9 +1313,9 @@ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE}"
# (Default: empty)
LB_BOOTAPPEND_INSTALL="${LB_BOOTAPPEND_INSTALL}"
-# \$LB_BOOTAPPEND_FAILSAFE: set boot parameters
+# \$LB_BOOTAPPEND_LIVE_FAILSAFE: set boot parameters
# (Default: empty)
-LB_BOOTAPPEND_FAILSAFE="${LB_BOOTAPPEND_FAILSAFE}"
+LB_BOOTAPPEND_LIVE_FAILSAFE="${LB_BOOTAPPEND_LIVE_FAILSAFE}"
# \$LB_BOOTLOADER: set bootloader
# (Default: ${LB_BOOTLOADER})