summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-04-26 23:11:25 +0200
committerDaniel Baumann <daniel@debian.org>2012-04-26 23:11:25 +0200
commit1315e5b1f59227bf40955ab52caeb318c91b41e3 (patch)
treed6ee5f6d92e5055ed5c726142fcbc76c2d2537de
parent4eec1db12fc4e573335fe7aa506a8c0c135254df (diff)
downloadvyos-live-build-1315e5b1f59227bf40955ab52caeb318c91b41e3.tar.gz
vyos-live-build-1315e5b1f59227bf40955ab52caeb318c91b41e3.zip
Unconditionally including firmware in all images by default. This is safe since only firmware available within the configured archive area is included automatically, see manpage.
-rwxr-xr-xfunctions/defaults.sh13
1 files changed, 2 insertions, 11 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index c0fc58b6e..b1efd6b87 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -1190,17 +1190,8 @@ Set_defaults ()
esac
# Setting firmware option
- case "${LB_MODE}" in
- progress)
- LB_FIRMWARE_CHROOT="${LB_FIRMWARE_CHROOT:-true}"
- LB_FIRMWARE_BINARY="${LB_FIRMWARE_BINARY:-true}"
- ;;
-
- *)
- LB_FIRMWARE_CHROOT="${LB_FIRMWARE_CHROOT:-false}"
- LB_FIRMWARE_BINARY="${LB_FIRMWARE_BINARY:-false}"
- ;;
- esac
+ LB_FIRMWARE_CHROOT="${LB_FIRMWARE_CHROOT:-true}"
+ LB_FIRMWARE_BINARY="${LB_FIRMWARE_BINARY:-true}"
# Setting swap file
LB_SWAP_FILE_SIZE="${LB_SWAP_FILE_SIZE:-512}"