summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-02-17 12:18:34 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:04 +0100
commiteeaec0fc3be0a434a80398f5555b5f33e468d16e (patch)
tree68333ec03b330b6dcf443121e7d1677c9ceb1d58 /functions
parent3d76871254d170cc4e9f0fcc6a4f115f8f875c1d (diff)
downloadvyos-live-build-eeaec0fc3be0a434a80398f5555b5f33e468d16e.tar.gz
vyos-live-build-eeaec0fc3be0a434a80398f5555b5f33e468d16e.zip
Don't append and re-append try-usb parameter to bootappend-install options over and over again.
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/defaults.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index f52578ff6..03b155477 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -782,7 +782,10 @@ Set_defaults ()
if [ "${LH_BINARY_IMAGES}" = "usb-hdd" ]
then
# Try USB block devices for install media
- LH_BOOTAPPEND_INSTALL="cdrom-detect/try-usb=true ${LH_BOOTAPPEND_INSTALL}"
+ if ! echo "${LH_BOOTAPPEND_INSTALL}" | grep -q try-usb
+ then
+ LH_BOOTAPPEND_INSTALL="cdrom-detect/try-usb=true ${LH_BOOTAPPEND_INSTALL}"
+ fi
fi
if [ -n ${_LH_BOOTAPPEND_PRESEED} ]