diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-02-18 17:12:59 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:17:04 +0100 |
| commit | 9d6a4dedc2736389349345c29d3a8a48b7b70692 (patch) | |
| tree | b227ffc3d77fcd3ba49dabbda5e2674c43f8bea3 /functions | |
| parent | 2dc16bc40d06c08030dc86b736d169a9cd65f791 (diff) | |
| download | vyos-live-build-9d6a4dedc2736389349345c29d3a8a48b7b70692.tar.gz vyos-live-build-9d6a4dedc2736389349345c29d3a8a48b7b70692.zip | |
Cleaning up usb helpers for a future usb-zip addition.
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/defaults.sh | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index fab7cfa01..a5712b75e 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -757,7 +757,7 @@ Set_defaults () _LH_BOOTAPPEND_PRESEED="file=/cdrom/install/${LH_DEBIAN_INSTALLER_PRESEEDFILE}" ;; - usb-hdd) + usb*) if [ "${LH_MODE}" = "ubuntu" ] || [ "${LH_DEBIAN_INSTALLER}" = "live" ] then _LH_BOOTAPPEND_PRESEED="file=/cdrom/install/${LH_DEBIAN_INSTALLER_PRESEEDFILE}" @@ -780,14 +780,15 @@ Set_defaults () esac fi - if [ "${LH_BINARY_IMAGES}" = "usb-hdd" ] - then - # Try USB block devices for install media - if ! echo "${LH_BOOTAPPEND_INSTALL}" | grep -q try-usb - then - LH_BOOTAPPEND_INSTALL="cdrom-detect/try-usb=true ${LH_BOOTAPPEND_INSTALL}" - fi - fi + case "${LH_BINARY_IMAGES}" in + usb*) + # Try USB block devices for install media + if ! echo "${LH_BOOTAPPEND_INSTALL}" | grep -q try-usb + then + LH_BOOTAPPEND_INSTALL="cdrom-detect/try-usb=true ${LH_BOOTAPPEND_INSTALL}" + fi + ;; + esac if [ -n ${_LH_BOOTAPPEND_PRESEED} ] then @@ -1028,16 +1029,17 @@ Check_defaults () esac fi - if [ "${LH_BINARY_IMAGES}" = "usb-hdd" ] - then - # grub or yaboot + usb-hdd - case "${LH_BOOTLOADER}" in - grub|yaboot) - Echo_error "You have selected a combination of bootloader and image type that is currently not supported by live-helper. Please use either another bootloader or a different image type." - exit 1 - ;; - esac - fi + case "${LH_BINARY_IMAGES}" in + usb*) + # grub or yaboot + usb + case "${LH_BOOTLOADER}" in + grub|yaboot) + Echo_error "You have selected a combination of bootloader and image type that is currently not supported by live-helper. Please use either another bootloader or a different image type." + exit 1 + ;; + esac + ;; + esac if [ "$(echo ${LH_ISO_APPLICATION} | wc -c)" -gt 128 ] then |