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

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-07-19 19:59:30 +0000 (Thu, 19 Jul 2007)
New Revision: 2530

Modified:
   dists/trunk/live-helper/docs/ChangeLog
   dists/trunk/live-helper/helpers/lh_binary_memtest
Log:


Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-07-19 18:42:56 UTC (rev 2529)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-07-19 19:59:30 UTC (rev 2530)
@@ -1,3 +1,9 @@
+2007-07-19  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_memtest:
+	  - Added workaround for grub inside chroot when installing memtest as
+	    suggested by Vladimir Stavrinov <vs at inist.ru>.
+
 2007-07-15  Daniel Baumann  <daniel at debian.org>
 
 	* examples/cron/manpages.sh, examples/hooks/win32-loader.sh:

Modified: dists/trunk/live-helper/helpers/lh_binary_memtest
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_memtest	2007-07-19 18:42:56 UTC (rev 2529)
+++ dists/trunk/live-helper/helpers/lh_binary_memtest	2007-07-19 19:59:30 UTC (rev 2530)
@@ -57,6 +57,13 @@
 	exit 0
 fi
 
+if [ -f chroot/usr/sbin/grub ] && [ ! -d chroot/boot/grub ]
+then
+	GRUB="yes"
+
+	mkdir -p chroot/boot/grub
+fi
+
 # Checking depends
 case "${LIVE_MEMTEST}" in
 	memtest86)
@@ -127,5 +134,10 @@
 # Removing depends
 Remove_package
 
+if [ "${GRUB}" ]
+then
+	rm -rf chroot/boot/grub
+fi
+
 # Creating stage file
 Create_stagefile .stage/binary_memtest