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

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-07-14 16:17:24 +0000 (Sat, 14 Jul 2007)
New Revision: 2472

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


Modified: dists/trunk/live-helper/debian/changelog
===================================================================
--- dists/trunk/live-helper/debian/changelog	2007-07-13 10:48:28 UTC (rev 2471)
+++ dists/trunk/live-helper/debian/changelog	2007-07-14 16:17:24 UTC (rev 2472)
@@ -1,4 +1,4 @@
-live-helper (1.0~a18-1) UNRELEASED; urgency=medium
+live-helper (1.0~a18-1) unstable; urgency=medium
 
   * New upstream release:
     - Dropping transitional package, not needed anymore.

Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-07-13 10:48:28 UTC (rev 2471)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-07-14 16:17:24 UTC (rev 2472)
@@ -1,5 +1,10 @@
 2007-07-12  Daniel Baumann  <daniel at debian.org>
 
+	* helpers/lh_binary_grub, lh_binary_syslinux:
+	  - Also respect local menu.lst and syslinux.cfg.
+	* helpers/lh_binary_syslinux:
+	  - Cleaned up netboot specific parts as suggested by
+	    Vladimir Stavrinov <vs at inist.ru>.
 	* helpers/lh_binary_linux-image:
 	  - Skip vmlinuz/initrd symlinks.
 	* helpers/lh_chroot_hacks:

Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub	2007-07-13 10:48:28 UTC (rev 2471)
+++ dists/trunk/live-helper/helpers/lh_binary_grub	2007-07-14 16:17:24 UTC (rev 2472)
@@ -188,7 +188,7 @@
 Grub_live_entry "live" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
 Grub_live_entry "live (fail-safe mode)" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" "${FAILSAFE}"
 
-for KERNEL in chroot/boot/vmlinuz*
+for KERNEL in chroot/boot/vmlinuz-*
 do
 	VERSION="`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
 
@@ -236,7 +236,7 @@
 mkdir -p binary/boot/grub
 cp -r "${LIVE_TEMPLATES}"/grub/* binary/boot/grub
 
-# Copyring grub
+# Copying grub
 case ${LIVE_BINARY_IMAGES} in
 	iso)
 		cp chroot/usr/lib/grub/*/stage2_eltorito binary/boot/grub
@@ -247,6 +247,12 @@
 		;;
 esac
 
+# Copying local configuration file
+if [ -f config/binary_grub/menu.lst ]
+then
+	cp config/binary_grub/menu.lst binary/boot/grub/menu.lst
+fi
+
 # Copying splash screen
 if [ -f config/binary_grub/splash.xpm.gz ]
 then

Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-07-13 10:48:28 UTC (rev 2471)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-07-14 16:17:24 UTC (rev 2472)
@@ -251,7 +251,7 @@
 
 if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
 then
-	for KERNEL in chroot/boot/vmlinuz*
+	for KERNEL in chroot/boot/vmlinuz-*
 	do
 		KERNEL_IMAGE="`basename ${KERNEL}`"
 		KERNEL_VERSION="`echo ${KERNEL_IMAGE} | sed -e 's/vmlinuz-//'`"
@@ -324,6 +324,12 @@
 		cp -r "${LIVE_TEMPLATES}"/syslinux/* binary/isolinux
 		mv binary/isolinux/syslinux.cfg binary/isolinux/isolinux.cfg
 
+		# Copying local configuration file
+		if [ -f config/binary_syslinux/syslinux.cfg ]
+		then
+			cp config/binary_syslinux/syslinux.cfg binary/isolinux/isolinux.cfg
+		fi
+
 		# Copying splash screen
 		if [ -f config/binary_syslinux/splash.rle ]
 		then
@@ -379,6 +385,12 @@
 		cp -r "${LIVE_TEMPLATES}"/syslinux/* tftpboot/pxelinux.cfg
 		mv tftpboot/pxelinux.cfg/syslinux.cfg tftpboot/pxelinux.cfg/default
 
+		# Copying local configuration file
+		if [ -f config/binary_syslinux/syslinux.cfg ]
+		then
+			cp config/binary_syslinux/syslinux.cfg tftpboot/pxelinux.cfg/default
+		fi
+
 		#sed -i -e 's#splash.rle#pxelinux.cfg/splash.rle#' tftpboot/pxelinux.cfg/boot.txt
 
 		# Copying splash screen
@@ -430,6 +442,12 @@
 		cp chroot/usr/lib/syslinux/isolinux.bin "${DESTDIR}"/syslinux.bin
 		cp -r "${LIVE_TEMPLATES}"/syslinux/* "${DESTDIR}"
 
+		# Copying local configuration file
+		if [ -f config/binary_syslinux/syslinux.cfg ]
+		then
+			cp config/binary_syslinux/syslinux.cfg "${DESTDIR}"/syslinux.cfg
+		fi
+
 		# Copying splash screen
 		if [ -f config/binary_syslinux/splash.rle ]
 		then

Modified: dists/trunk/live-helper/helpers/lh_binary_yaboot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-07-13 10:48:28 UTC (rev 2471)
+++ dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-07-14 16:17:24 UTC (rev 2472)
@@ -198,7 +198,7 @@
 
 if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
 then
-	for KERNEL in chroot/boot/vmlinux*
+	for KERNEL in chroot/boot/vmlinux-*
 	do
 		KERNEL_IMAGE="`basename ${KERNEL}`"
 		KERNEL_VERSION="`echo ${KERNEL_IMAGE} | sed -e 's/vmlinux-//'`"