summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-11-02 11:19:42 +0100
committerDaniel Baumann <daniel@debian.org>2010-11-02 11:28:10 +0100
commit4b9064678c736be90615e7cf46c0686171c29293 (patch)
treed6452b9d1c4859dbbc129059bbfa053ef29753af /functions
parentc4eb3897b1ffdf271c1776f4d174440371ac29dc (diff)
downloadvyos-live-build-4b9064678c736be90615e7cf46c0686171c29293.tar.gz
vyos-live-build-4b9064678c736be90615e7cf46c0686171c29293.zip
First step in cleaning up syslinux handling by using syslinux-theme packages rather than embedded templates.
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/defaults.sh28
1 files changed, 2 insertions, 26 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 0a1da1fac..72618f9c7 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -1060,32 +1060,8 @@ Set_defaults ()
# Setting net tarball
LB_NET_TARBALL="${LB_NET_TARBALL:-gzip}"
- # Setting syslinux configuration file
- # LB_SYSLINUX_CFG
-
- # Setting syslinux splash
- # LB_SYSLINUX_SPLASH
-
- LB_SYSLINUX_TIMEOUT="${LB_SYSLINUX_TIMEOUT:-0}"
-
- # Setting syslinux menu
- LB_SYSLINUX_MENU="${LB_SYSLINUX_MENU:-true}"
-
- # Setting syslinux menu live entries
- case "${LB_MODE}" in
- debian|debian-release)
- LB_SYSLINUX_MENU_LIVE_ENTRY="${LB_SYSLINUX_MENU_LIVE_ENTRY:-Live}"
- LB_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE="${LB_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE:-${LB_SYSLINUX_MENU_LIVE_ENTRY} (failsafe)}"
- ;;
-
- *)
- LB_SYSLINUX_MENU_LIVE_ENTRY="${LB_SYSLINUX_MENU_LIVE_ENTRY:-Start ${LB_ISO_APPLICATION}}"
- LB_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE="${LB_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE:-${LB_SYSLINUX_MENU_LIVE_ENTRY} (failsafe)}"
- ;;
- esac
-
- # Settings memtest menu entry
- LB_SYSLINUX_MENU_MEMTEST_ENTRY="${LB_SYSLINUX_MENU_MEMTEST_ENTRY:-Memory test}"
+ # Setting syslinux theme package
+ LB_SYSLINUX_THEME="${LB_SYSLINUX_THEME:-debian-squeeze}"
# Setting username
case "${LB_MODE}" in