[SCM] Debian Live build scripts branch, master, updated. 1.0.3-1-30-ga27038d

Daniel Baumann daniel at debian.org
Mon Feb 9 23:21:58 UTC 2009


The following commit has been merged in the master branch:
commit a27038d044f6086cbbd9982f096fd2f307f591ff
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Feb 10 00:20:30 2009 +0100

    Only enabling win32-loader by default if we also include debian-installer.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 2d633a8..dc2c5a1 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -697,7 +697,12 @@ Set_defaults ()
 	# Setting win32-loader option
 	case "${LH_ARCHITECTURE}" in
 		amd64|i386)
-			LH_WIN32_LOADER="${LH_WIN32_LOADER:-enabled}"
+			if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
+			then
+				LH_WIN32_LOADER="${LH_WIN32_LOADER:-enabled}"
+			else
+				LH_WIN32_LOADER="${LH_WIN32_LOADER:-disabled}"
+			fi
 			;;
 
 		*)

-- 
Debian Live build scripts



More information about the debian-live-changes mailing list