diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-06-03 08:24:31 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-06-03 08:24:31 +0200 |
| commit | 5953d2c9489c3ea808fed62073209ab03cc0a953 (patch) | |
| tree | 2106945a29f69a842df2739cbd2a20ccd4f4bb07 | |
| parent | 10c79ed504fc1fe59abe7f21c752d3da8b5e7f6f (diff) | |
| download | vyos-live-build-5953d2c9489c3ea808fed62073209ab03cc0a953.tar.gz vyos-live-build-5953d2c9489c3ea808fed62073209ab03cc0a953.zip | |
Don't bother supporting firmware on ubuntu, they seem to have a different archive structure.
| -rwxr-xr-x | functions/defaults.sh | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 9d28dd5aa..f44df78f7 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -1190,8 +1190,17 @@ Set_defaults () esac # Setting firmware option - LB_FIRMWARE_CHROOT="${LB_FIRMWARE_CHROOT:-true}" - LB_FIRMWARE_BINARY="${LB_FIRMWARE_BINARY:-true}" + case "${LB_MODE}" in + ubuntu) + LB_FIRMWARE_CHROOT="${LB_FIRMWARE_CHROOT:-false}" + LB_FIRMWARE_BINARY="${LB_FIRMWARE_BINARY:-false}" + ;; + + *) + LB_FIRMWARE_CHROOT="${LB_FIRMWARE_CHROOT:-true}" + LB_FIRMWARE_BINARY="${LB_FIRMWARE_BINARY:-true}" + ;; + esac # Setting swap file LB_SWAP_FILE_SIZE="${LB_SWAP_FILE_SIZE:-512}" |