[SCM] live-build branch, debian-next, updated. debian/3.0_a46-1-18-g1315e5b

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 1315e5b1f59227bf40955ab52caeb318c91b41e3
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Apr 26 23:11:25 2012 +0200

    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.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index c0fc58b..b1efd6b 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}"

-- 
live-build