diff options
author | Daniel Baumann <mail@daniel-baumann.ch> | 2015-04-29 07:52:56 +0200 |
---|---|---|
committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-04-29 07:52:56 +0200 |
commit | 7e633e77f24b6f5ab9a8b22d7d6cf6521454d638 (patch) | |
tree | c4a11950037f0e66cd79e00761302f8cc8acfb76 /functions | |
parent | 7f6b1d71f8f6c66a78ba88f19cf12c035476f4ef (diff) | |
download | vyos-live-build-7e633e77f24b6f5ab9a8b22d7d6cf6521454d638.tar.gz vyos-live-build-7e633e77f24b6f5ab9a8b22d7d6cf6521454d638.zip |
Moving grub and grub2 templates into shared bootloader config directory.
Diffstat (limited to 'functions')
-rwxr-xr-x | functions/defaults.sh | 8 | ||||
-rwxr-xr-x | functions/templates.sh | 25 |
2 files changed, 0 insertions, 33 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index a1040d786..5f93f4ac0 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -341,14 +341,6 @@ Set_defaults () ;; esac - # Setting templates - if [ -n "${LIVE_BUILD}" ] - then - LB_TEMPLATES="${LB_TEMPLATES:-${LIVE_BUILD}/templates}" - else - LB_TEMPLATES="${LB_TEMPLATES:-/usr/share/live/build/templates}" - fi - # Setting live build options _BREAKPOINTS="${_BREAKPOINTS:-false}" _COLOR="${_COLOR:-false}" diff --git a/functions/templates.sh b/functions/templates.sh deleted file mode 100755 index e22a7a1ed..000000000 --- a/functions/templates.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -## live-build(7) - System Build Scripts -## Copyright (C) 2006-2015 Daniel Baumann <mail@daniel-baumann.ch> -## -## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. -## This is free software, and you are welcome to redistribute it -## under certain conditions; see COPYING for details. - - -Check_templates () -{ - PACKAGE="${1}" - - if [ -d "config/templates/${PACKAGE}" ] - then - TEMPLATES="config/templates/${PACKAGE}" - elif [ -d "${LB_TEMPLATES}/${PACKAGE}" ] - then - TEMPLATES="${LB_TEMPLATES}/${PACKAGE}" - else - Echo_error "%s templates not accessible in %s nor config/templates" "${PACKAGE}" "${LB_TEMPLATES}" - exit 1 - fi -} |