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

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-07-19 22:12:50 +0000 (Thu, 19 Jul 2007)
New Revision: 2537

Modified:
   dists/trunk/live-helper/helpers/lh_binary_grub
Log:


Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub	2007-07-19 22:06:53 UTC (rev 2536)
+++ dists/trunk/live-helper/helpers/lh_binary_grub	2007-07-19 22:12:50 UTC (rev 2537)
@@ -236,17 +236,24 @@
 mkdir -p binary/boot/grub
 cp -r "${TEMPLATES}"/* binary/boot/grub
 
-# Copying grub
 case ${LIVE_BINARY_IMAGES} in
 	iso)
-		cp chroot/usr/lib/grub/*/stage2_eltorito binary/boot/grub
+		FILES="chroot/usr/lib/grub/*/stage2_eltorito"
 		;;
 
 	tar|usb-hdd)
-		cp chroot/usr/lib/grub/*/stage1 chroot/usr/lib/grub/*/e2fs_stage1_5 chroot/usr/lib/grub/*/stage2 binary/boot/grub
+		FILES="chroot/usr/lib/grub/*/stage1 chroot/usr/lib/grub/*/e2fs_stage1_5 chroot/usr/lib/grub/*/stage2"
 		;;
 esac
 
+if [ "${LH_CHROOT_BUILD}" = "disabled" ]
+then
+	FILES="`echo ${FILES} | sed -e 's/chroot//g'`"
+fi
+
+# Copying grub
+cp "${FILES}" binary/boot/grub
+
 # Copying local configuration file
 if [ -f config/binary_grub/menu.lst ]
 then