[Debian-live-changes] r1505 - in dists/trunk/live-helper: docs helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-16 08:53:51 +0000 (Wed, 16 May 2007)
New Revision: 1505

Modified:
   dists/trunk/live-helper/docs/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
   dists/trunk/live-helper/helpers/lh_binary_yaboot
   dists/trunk/live-helper/helpers/lh_config
Log:


Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-05-16 08:35:31 UTC (rev 1504)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-05-16 08:53:51 UTC (rev 1505)
@@ -1,3 +1,8 @@
+2007-05-16  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/*:
+	  - Added check for local includes and templates.
+
 2007-05-09  Daniel Baumann  <daniel at debian.org>
 
 	* helpers/*:

Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub	2007-05-16 08:35:31 UTC (rev 1504)
+++ dists/trunk/live-helper/helpers/lh_binary_grub	2007-05-16 08:53:51 UTC (rev 1505)
@@ -57,7 +57,7 @@
 	exit 0
 fi
 
-# Check templates
+# Check user templates
 if [ ! -d "${LIVE_TEMPLATES}" ]
 then
 	if [ -d ../"${LIVE_TEMPLATES}" ]
@@ -69,6 +69,12 @@
 	fi
 fi
 
+# Check local templates
+if [ -d config/templates ]
+then
+	LIVE_TEMPLATES="config/templates"
+fi
+
 # Checking depends
 Check_package chroot/usr/sbin/grub grub
 

Modified: dists/trunk/live-helper/helpers/lh_binary_includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_includes	2007-05-16 08:35:31 UTC (rev 1504)
+++ dists/trunk/live-helper/helpers/lh_binary_includes	2007-05-16 08:53:51 UTC (rev 1505)
@@ -51,7 +51,7 @@
 # Creating lock file
 Create_lockfile .lock
 
-# Check includes
+# Check user includes
 if [ ! -d "${LIVE_INCLUDES}" ]
 then
 	if [ -d ../"${LIVE_INCLUDES}" ]
@@ -63,6 +63,12 @@
 	fi
 fi
 
+# Checking local includes
+if [ -d config/includes ]
+then
+	LIVE_INCLUDES="config/includes"
+fi
+
 # Assemble architecture
 case "${LIVE_ARCHITECTURE}" in
 	amd64)

Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-05-16 08:35:31 UTC (rev 1504)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-05-16 08:53:51 UTC (rev 1505)
@@ -57,7 +57,7 @@
 	exit 0
 fi
 
-# Checking templates
+# Checking user templates
 if [ ! -d "${LIVE_TEMPLATES}" ]
 then
 	if [ -d ../"${LIVE_TEMPLATES}" ]
@@ -69,6 +69,12 @@
 	fi
 fi
 
+# Check local templates
+if [ -d config/templates ]
+then
+	LIVE_TEMPLATES="config/templates"
+fi
+
 # Checking depends
 Check_package chroot/usr/bin/syslinux syslinux
 

Modified: dists/trunk/live-helper/helpers/lh_binary_yaboot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-05-16 08:35:31 UTC (rev 1504)
+++ dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-05-16 08:53:51 UTC (rev 1505)
@@ -57,7 +57,7 @@
 	exit 0
 fi
 
-# Check templates
+# Check user templates
 if [ ! -d "${LIVE_TEMPLATES}" ]
 then
 	if [ -d ../"${LIVE_TEMPLATES}" ]
@@ -69,6 +69,12 @@
 	fi
 fi
 
+# Checking local templates
+if [ -d config/templates ]
+then
+	LIVE_TEMPLATES="config/templates"
+fi
+
 # Checking depends
 Check_package chroot/usr/lib/yaboot/yaboot yaboot
 

Modified: dists/trunk/live-helper/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config	2007-05-16 08:35:31 UTC (rev 1504)
+++ dists/trunk/live-helper/helpers/lh_config	2007-05-16 08:53:51 UTC (rev 1505)
@@ -57,6 +57,8 @@
 
 # Creating configuration directory
 mkdir -p "${LIVE_ROOT}"/config
+mkdir -p "${LIVE_ROOT}"/config/includes
+mkdir -p "${LIVE_ROOT}"/config/templates
 
 # Creating live-helper configuration
 cat > "${LIVE_ROOT}"/config/common << EOF