[SCM] live-helper branch, debian, updated. debian/2.0_a2-1-5-g8b24c58

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 8b24c585e57d8bef4ebf2e5e3541b9cd4d3f5cf8
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Dec 9 21:56:17 2009 +0100

    Setting win32-loader to disabled in ubuntu mode.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index c330b42..a2b3b7a 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -877,20 +877,23 @@ Set_defaults ()
 	LH_MEMTEST="${LH_MEMTEST:-memtest86+}"
 
 	# Setting win32-loader option
-	case "${LH_ARCHITECTURE}" in
-		amd64|i386)
-			if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
-			then
-				LH_WIN32_LOADER="${LH_WIN32_LOADER:-enabled}"
-			else
-				LH_WIN32_LOADER="${LH_WIN32_LOADER:-disabled}"
-			fi
-			;;
+	if [ "${LH_MODE}" != "ubuntu" ]
+	then
+		case "${LH_ARCHITECTURE}" in
+			amd64|i386)
+				if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
+				then
+					LH_WIN32_LOADER="${LH_WIN32_LOADER:-enabled}"
+				else
+					LH_WIN32_LOADER="${LH_WIN32_LOADER:-disabled}"
+				fi
+				;;
 
-		*)
-			LH_WIN32_LOADER="${LH_WIN32_LOADER:-disabled}"
-			;;
-	esac
+			*)
+				LH_WIN32_LOADER="${LH_WIN32_LOADER:-disabled}"
+				;;
+		esac
+	fi
 
 	# Setting netboot filesystem
 	LH_NET_ROOT_FILESYSTEM="${LH_NET_ROOT_FILESYSTEM:-nfs}"

-- 
live-helper