[Debian-live-changes] r1506 - dists/trunk/live-helper/helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-16 08:57:35 +0000 (Wed, 16 May 2007)
New Revision: 1506

Modified:
   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
Log:


Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub	2007-05-16 08:53:51 UTC (rev 1505)
+++ dists/trunk/live-helper/helpers/lh_binary_grub	2007-05-16 08:57:35 UTC (rev 1506)
@@ -70,7 +70,7 @@
 fi
 
 # Check local templates
-if [ -d config/templates ]
+if [ -d config/templates/grub ]
 then
 	LIVE_TEMPLATES="config/templates"
 fi

Modified: dists/trunk/live-helper/helpers/lh_binary_includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_includes	2007-05-16 08:53:51 UTC (rev 1505)
+++ dists/trunk/live-helper/helpers/lh_binary_includes	2007-05-16 08:57:35 UTC (rev 1506)
@@ -64,7 +64,7 @@
 fi
 
 # Checking local includes
-if [ -d config/includes ]
+if [ -d config/includes/"${LIVE_DISTRIBUTION}" ]
 then
 	LIVE_INCLUDES="config/includes"
 fi

Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-05-16 08:53:51 UTC (rev 1505)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-05-16 08:57:35 UTC (rev 1506)
@@ -70,7 +70,7 @@
 fi
 
 # Check local templates
-if [ -d config/templates ]
+if [ -d config/templates/syslinux ]
 then
 	LIVE_TEMPLATES="config/templates"
 fi

Modified: dists/trunk/live-helper/helpers/lh_binary_yaboot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-05-16 08:53:51 UTC (rev 1505)
+++ dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-05-16 08:57:35 UTC (rev 1506)
@@ -70,7 +70,7 @@
 fi
 
 # Checking local templates
-if [ -d config/templates ]
+if [ -d config/templates/yaboot ]
 then
 	LIVE_TEMPLATES="config/templates"
 fi