From 3171fcb3f28fd7930edbafa7c92ec001afa70d95 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Wed, 9 Dec 2009 21:56:17 +0100
Subject: Setting win32-loader to disabled in ubuntu mode.

---
 functions/defaults.sh | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'functions/defaults.sh')

diff --git a/functions/defaults.sh b/functions/defaults.sh
index c330b4281..a2b3b7aef 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}"
-- 
cgit v1.2.3