summaryrefslogtreecommitdiff
path: root/helpers/lh_binary_syslinux
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 10:05:11 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:18:30 +0100
commit85c342c299231131d22764c0dfdcf977c57ce147 (patch)
tree1226c8a7ad43a2dd53e411c2e379969424e88e32 /helpers/lh_binary_syslinux
parentd1ee66e44c8272bb7a0053a456a3d8b0bd152268 (diff)
downloadvyos-live-build-85c342c299231131d22764c0dfdcf977c57ce147.tar.gz
vyos-live-build-85c342c299231131d22764c0dfdcf977c57ce147.zip
Adding live-helper 1.0~a13-1.
Diffstat (limited to 'helpers/lh_binary_syslinux')
-rwxr-xr-xhelpers/lh_binary_syslinux21
1 files changed, 9 insertions, 12 deletions
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 124cb362c..869bcc1f4 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -9,21 +9,21 @@
set -e
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
do
- . ${FUNCTION}
+ . "${FUNCTION}"
done
-# Set static variables
+# Setting static variables
DESCRIPTION="installs syslinux into binary"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
-Echo_debug "Init ${PROGRAM}"
-
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
@@ -37,7 +37,7 @@ then
exit 0
fi
-Breakpoint "binary_syslinux: Init"
+Echo_message "Begin installing syslinux..."
# Requiring stage file
Require_stagefile .stage/bootstrap
@@ -137,10 +137,7 @@ then
fi
# Creating directory
-if [ ! -d "${DESTDIR_LIVE}" ]
-then
- mkdir -p "${DESTDIR_LIVE}"
-fi
+mkdir -p "${DESTDIR_LIVE}"
# Setting boot parameters
if [ -n "${LIVE_ENCRYPTION}" ]
@@ -174,7 +171,7 @@ then
live-initramfs)
if [ "${LIVE_HOSTNAME}" != "debian" ]
then
- LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_HOSTNAME}"
+ LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
fi
;;
esac