diff options
| author | Daniel Baumann <daniel@debian.org> | 2009-12-09 21:56:17 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:17:03 +0100 |
| commit | 3171fcb3f28fd7930edbafa7c92ec001afa70d95 (patch) | |
| tree | 7adda0c5f23e18ae7c13163132d84a770f98ceff /functions | |
| parent | 352d962ee88f559ee19ec57732665ef583221fd9 (diff) | |
| download | vyos-live-build-3171fcb3f28fd7930edbafa7c92ec001afa70d95.tar.gz vyos-live-build-3171fcb3f28fd7930edbafa7c92ec001afa70d95.zip | |
Setting win32-loader to disabled in ubuntu mode.
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/defaults.sh | 29 |
1 files changed, 16 insertions, 13 deletions
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}" |