From 85c342c299231131d22764c0dfdcf977c57ce147 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 23 Sep 2007 10:05:11 +0200
Subject: Adding live-helper 1.0~a13-1.

---
 helpers/lh_binary_syslinux | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'helpers/lh_binary_syslinux')

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
-- 
cgit v1.2.3