summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-02-10 00:20:30 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:09:42 +0100
commit1d696b028acc5f6a2e2550b1098dc4e4b952ef8d (patch)
tree2da825f84666917ae51c4fc68ac2fce1671186cc
parent9ac71a43ef6520798d3b3dc9ff62c4c98ada92df (diff)
downloadlive-build-1d696b028acc5f6a2e2550b1098dc4e4b952ef8d.zip
live-build-1d696b028acc5f6a2e2550b1098dc4e4b952ef8d.tar.gz
Only enabling win32-loader by default if we also include debian-installer.
-rwxr-xr-xfunctions/defaults.sh7
1 files changed, 6 insertions, 1 deletions
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
;;
*)