[Debian-live-changes] r933 - in dists/trunk/live-helper: doc helpers

[Daniel Baumann]

Author: daniel
Date: 2007-04-03 20:06:57 +0000 (Tue, 03 Apr 2007)
New Revision: 933

Modified:
   dists/trunk/live-helper/doc/ChangeLog
   dists/trunk/live-helper/helpers/lh_binary_grub
   dists/trunk/live-helper/helpers/lh_binary_includes
   dists/trunk/live-helper/helpers/lh_binary_syslinux
Log:


Modified: dists/trunk/live-helper/doc/ChangeLog
===================================================================
--- dists/trunk/live-helper/doc/ChangeLog	2007-04-03 19:58:30 UTC (rev 932)
+++ dists/trunk/live-helper/doc/ChangeLog	2007-04-03 20:06:57 UTC (rev 933)
@@ -1,3 +1,10 @@
+2006-04-03  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_grub, lh_binary_grub:
+	  - Added check for LIVE_TEMPLATES to be existing.
+	* helpers/lh_binary_includes:
+	  - Added check for LIVE_INCLUDES to be existing.
+
 2006-04-02  Daniel Baumann  <daniel at debian.org>
 
 	* functions/*, helpers/*:

Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub	2007-04-03 19:58:30 UTC (rev 932)
+++ dists/trunk/live-helper/helpers/lh_binary_grub	2007-04-03 20:06:57 UTC (rev 933)
@@ -49,6 +49,18 @@
 
 if [ "${LIVE_BOOTLOADER}" = "grub" ]
 then
+	# Check templates
+	if [ ! -d "${LIVE_TEMPLATES}" ]
+	then
+		if [ -d ../"${LIVE_TEMPLATES}" ]
+		then
+			LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
+		fi
+	else
+		Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
+		exit 1
+	fi
+
 	if [ ! -f chroot/usr/sbin/grub ]
 	then
 		PACKAGES="${PACKAGES} grub"

Modified: dists/trunk/live-helper/helpers/lh_binary_includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_includes	2007-04-03 19:58:30 UTC (rev 932)
+++ dists/trunk/live-helper/helpers/lh_binary_includes	2007-04-03 20:06:57 UTC (rev 933)
@@ -40,6 +40,18 @@
 # Checking stage file
 Check_stagefile .stage/binary_includes
 
+# Check includes
+if [ ! -d "${LIVE_INCLUDES}" ]
+then
+	if [ -d ../"${LIVE_INCLUDES}" ]
+	then
+		LIVE_INCLUDES="../${LIVE_INCLUDES}"
+	fi
+else
+	Echo_error "user specified templates not accessible in ${LIVE_INCLUDES}"
+	exit 1
+fi
+
 if ls "${LIVE_INCLUDES}"/common/* &> /dev/null
 then
 	cd "${LIVE_INCLUDES}"/common

Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-04-03 19:58:30 UTC (rev 932)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-04-03 20:06:57 UTC (rev 933)
@@ -49,6 +49,18 @@
 
 if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
 then
+	# Check templates
+	if [ ! -d "${LIVE_TEMPLATES}" ]
+	then
+		if [ -d ../"${LIVE_TEMPLATES}" ]
+		then
+			LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
+		fi
+	else
+		Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
+		exit 1
+	fi
+
 	if [ ! -f chroot/usr/bin/syslinux ]
 	then
 		PACKAGES="${PACKAGES} syslinux"