summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-09-29 13:20:21 +0200
committerDaniel Baumann <daniel@debian.org>2012-09-29 13:23:31 +0200
commit7fad1b698dca380d27a483efa7eff581e857967b (patch)
treecf4cefec5f1475d593c1c5f26279839a99391f9e /functions
parent6b12a3fb7d2c3066b95180ea2bed5364986a4400 (diff)
downloadvyos-live-build-7fad1b698dca380d27a483efa7eff581e857967b.tar.gz
vyos-live-build-7fad1b698dca380d27a483efa7eff581e857967b.zip
Including loadlin on d-i images on amd64 and i386.
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/defaults.sh24
1 files changed, 24 insertions, 0 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index bd7f0a4f7..8af9c8455 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -1123,6 +1123,30 @@ Set_defaults ()
# Setting memtest option
LB_MEMTEST="${LB_MEMTEST:-memtest86+}"
+ # Setting loadlin option
+ case "${LB_MODE}" in
+ progress|ubuntu|kubuntu)
+
+ ;;
+
+ *)
+ case "${LB_ARCHITECTURES}" in
+ amd64|i386)
+ if [ "${LB_DEBIAN_INSTALLER}" != "false" ]
+ then
+ LB_LOADLIN="${LB_LOADLIN:-true}"
+ else
+ LB_LOADLIN="${LB_LOADLIN:-false}"
+ fi
+ ;;
+
+ *)
+ LB_LOADLIN="${LB_LOADLIN:-false}"
+ ;;
+ esac
+ ;;
+ esac
+
# Setting win32-loader option
case "${LB_MODE}" in
progress|ubuntu|kubuntu)