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

[Daniel Baumann]

Author: daniel
Date: 2007-04-06 11:16:07 +0000 (Fri, 06 Apr 2007)
New Revision: 956

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


Modified: dists/trunk/live-helper/doc/ChangeLog
===================================================================
--- dists/trunk/live-helper/doc/ChangeLog	2007-04-06 11:04:16 UTC (rev 955)
+++ dists/trunk/live-helper/doc/ChangeLog	2007-04-06 11:16:07 UTC (rev 956)
@@ -2,6 +2,8 @@
 
 	* functions/lockfile.sh:
 	  - Added additional signals to the trap.
+	* helpers/lh_binary_includes:
+	  - Respect LIVE_INCLUDES=none.
 
 2007-04-05  Daniel Baumann  <daniel at debian.org>
 

Modified: dists/trunk/live-helper/doc/TODO
===================================================================
--- dists/trunk/live-helper/doc/TODO	2007-04-06 11:04:16 UTC (rev 955)
+++ dists/trunk/live-helper/doc/TODO	2007-04-06 11:16:07 UTC (rev 956)
@@ -9,7 +9,6 @@
 
   * write manpage and documentation
   * write lh_binary_di and lh_binary_gi
-  * write lh_binary_grub
 
 Later:
   * Add win32 autorun like

Modified: dists/trunk/live-helper/helpers/lh_binary_includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_includes	2007-04-06 11:04:16 UTC (rev 955)
+++ dists/trunk/live-helper/helpers/lh_binary_includes	2007-04-06 11:16:07 UTC (rev 956)
@@ -29,43 +29,46 @@
 Read_conffile config/image
 Set_defaults
 
-# Requiring stage file
-Require_stagefile .stage/bootstrap
+if [ "${LIVE_INCLUDES}" != "none" ]
+then
+	# Requiring stage file
+	Require_stagefile .stage/bootstrap
 
-# Checking lock file
-Check_lockfile .lock
+	# Checking lock file
+	Check_lockfile .lock
 
-# Creating lock file
-Create_lockfile .lock
+	# Creating lock file
+	Create_lockfile .lock
 
-# Checking stage file
-Check_stagefile .stage/binary_includes
+	# Checking stage file
+	Check_stagefile .stage/binary_includes
 
-# Check includes
-if [ ! -d "${LIVE_INCLUDES}" ]
-then
-	if [ -d ../"${LIVE_INCLUDES}" ]
+	# Check includes
+	if [ ! -d "${LIVE_INCLUDES}" ]
 	then
-		LIVE_INCLUDES="../${LIVE_INCLUDES}"
-	else
-		Echo_error "user specified includes not accessible in ${LIVE_INCLUDES}"
-		exit 1
+		if [ -d ../"${LIVE_INCLUDES}" ]
+		then
+			LIVE_INCLUDES="../${LIVE_INCLUDES}"
+		else
+			Echo_error "user specified includes not accessible in ${LIVE_INCLUDES}"
+			exit 1
+		fi
 	fi
-fi
 
-if ls "${LIVE_INCLUDES}"/common/* &> /dev/null
-then
-	cd "${LIVE_INCLUDES}"/common
-	find . | cpio -dmpu "${OLDPWD}"/binary
-	cd "${OLDPWD}"
-fi
+	if ls "${LIVE_INCLUDES}"/common/* &> /dev/null
+	then
+		cd "${LIVE_INCLUDES}"/common
+		find . | cpio -dmpu "${OLDPWD}"/binary
+		cd "${OLDPWD}"
+	fi
 
-if ls "${LIVE_INCLUDES}"/"${LIVE_BINARY_IMAGE}"/* &> /dev/null
-then
-	cd "${LIVE_INCLUDES}"/"${LIVE_BINARY_IMAGE}"
-	find . | cpio -dmpu "${OLDPWD}"/binary
-	cd "${OLDPWD}"
+	if ls "${LIVE_INCLUDES}"/"${LIVE_BINARY_IMAGE}"/* &> /dev/null
+	then
+		cd "${LIVE_INCLUDES}"/"${LIVE_BINARY_IMAGE}"
+		find . | cpio -dmpu "${OLDPWD}"/binary
+		cd "${OLDPWD}"
+	fi
+
+	# Creating stage file
+	Create_stagefile .stage/binary_includes
 fi
-
-# Creating stage file
-Create_stagefile .stage/binary_includes