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

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-07-20 06:13:02 +0000 (Fri, 20 Jul 2007)
New Revision: 2551

Modified:
   dists/trunk/live-helper/debian/changelog
   dists/trunk/live-helper/docs/ChangeLog
   dists/trunk/live-helper/helpers/lh_binary_grub
Log:


Modified: dists/trunk/live-helper/debian/changelog
===================================================================
--- dists/trunk/live-helper/debian/changelog	2007-07-20 05:44:28 UTC (rev 2550)
+++ dists/trunk/live-helper/debian/changelog	2007-07-20 06:13:02 UTC (rev 2551)
@@ -2,6 +2,7 @@
 
   * New upstream release:
     - Supports using packages from the build host (Closes: #433611).
+    - Adds destdir to default entries in grub (Closes: #433612).
 
  -- Daniel Baumann <daniel at debian.org>  Mon, 16 Jul 2007 00:00:00 +0200
 

Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-07-20 05:44:28 UTC (rev 2550)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-07-20 06:13:02 UTC (rev 2551)
@@ -1,16 +1,18 @@
 2007-07-19  Daniel Baumann  <daniel at debian.org>
 
+	* functions/defaults.sh, package.sh, helpers/lh_config, lh_binary_*:
+	  - Added support for non-chrooted build.
+	  - Added caching of deb packages on this stage too.
+	* helpers/lh_binary_grub:
+	  - Added forgotten destdir for default entries.
 	* helpers/lh_binary_memtest:
 	  - Added workaround for grub inside chroot when installing memtest as
 	    suggested by Vladimir Stavrinov <vs at inist.ru>.
+	* helpers/lh_binary_rootfs:
+	  - Updated squashfs-tools package check.
 	* helpers/lh_binary_syslinux:
 	  - Using etch workaround for long filenames in syslinux on all
 	    distributions.
-	* functions/defaults.sh, package.sh, helpers/lh_config, lh_binary_*:
-	  - Added support for non-chrooted build.
-	  - Added caching of deb packages on this stage too.
-	* helpers/lh_binary_rootfs:
-	  - Updated squashfs-tools package check.
 	* Uploaded 1.0~a19-1.
 
 2007-07-15  Daniel Baumann  <daniel at debian.org>

Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub	2007-07-20 05:44:28 UTC (rev 2550)
+++ dists/trunk/live-helper/helpers/lh_binary_grub	2007-07-20 06:13:02 UTC (rev 2551)
@@ -188,8 +188,8 @@
 DEFAULT_KERNEL="`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`"
 DEFAULT_INITRD="initrd.img-`echo ${DEFAULT_KERNEL} | sed -e 's/vmlinuz-//'`"
 
-Grub_live_entry "live" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
-Grub_live_entry "live (fail-safe mode)" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" "${FAILSAFE}"
+Grub_live_entry "live" "`basename ${DESTDIR_LIVE}`/${DEFAULT_KERNEL}" "`basename ${DESTDIR_LIVE}`/${DEFAULT_INITRD}"
+Grub_live_entry "live (fail-safe mode)" "`basename ${DESTDIR_LIVE}`/${DEFAULT_KERNEL}" "`basename ${DESTDIR_LIVE}`/${DEFAULT_INITRD}" "${FAILSAFE}"
 
 for KERNEL in chroot/boot/vmlinuz-*
 do
@@ -255,7 +255,7 @@
 fi
 
 # Copying grub
-cp "${FILES}" binary/boot/grub
+cp ${FILES} binary/boot/grub
 
 # Copying local configuration file
 if [ -f config/binary_grub/menu.lst ]