[SCM] live-build branch, debian, updated. debian/3.0_a48-1-17-g6e10198

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 5953d2c9489c3ea808fed62073209ab03cc0a953
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Jun 3 08:24:31 2012 +0200

    Don't bother supporting firmware on ubuntu, they seem to have a different archive structure.

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

-- 
live-build