[Debian-live-changes] r917 - in dists/trunk/live-helper: doc
helpers templates/grub templates/syslinux
Daniel Baumann
daniel at alioth.debian.org
Mon Apr 2 10:49:57 UTC 2007
Author: daniel
Date: 2007-04-02 10:49:56 +0000 (Mon, 02 Apr 2007)
New Revision: 917
Modified:
dists/trunk/live-helper/doc/ChangeLog
dists/trunk/live-helper/helpers/lh_binary_grub
dists/trunk/live-helper/helpers/lh_binary_iso
dists/trunk/live-helper/helpers/lh_binary_syslinux
dists/trunk/live-helper/templates/grub/menu.lst
dists/trunk/live-helper/templates/syslinux/isolinux.cfg
Log:
Modified: dists/trunk/live-helper/doc/ChangeLog
===================================================================
--- dists/trunk/live-helper/doc/ChangeLog 2007-04-01 20:39:56 UTC (rev 916)
+++ dists/trunk/live-helper/doc/ChangeLog 2007-04-02 10:49:56 UTC (rev 917)
@@ -1,3 +1,10 @@
+2006-04-02 Daniel Baumann <daniel at debian.org>
+
+ * functions/*, helpers/*:
+ - Merged LIVE_SYSLINUX and LIVE_GRUB into LIVE_BOOTLOADER.
+ * helpers/lh_binary_iso:
+ - Added exclude for the bootloader from the iso image content.
+
2006-04-01 Daniel Baumann <daniel at debian.org>
* helper/lh_binary_grub:
Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub 2007-04-01 20:39:56 UTC (rev 916)
+++ dists/trunk/live-helper/helpers/lh_binary_grub 2007-04-02 10:49:56 UTC (rev 917)
@@ -70,17 +70,13 @@
# Setting destination directory
case "${LIVE_BINARY_IMAGE}" in
- iso)
+ iso|usb|hdd)
DESTDIR="binary/live"
;;
net)
- DESTDIR="tftpboot"
+ Echo_error "not supported, FIXME"
;;
-
- usb|hdd)
- DESTDIR="binary"
- ;;
esac
# Temporary check for broken syslinux
@@ -121,10 +117,10 @@
if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
then
DEFAULT_FLAVOUR="`echo ${LIVE_KERNEL_FLAVOUR} | awk '{ print $1 }'`"
- LINUX="title\tlinux\nroot\t(cd)\nkernel\t/`basename ${DESTDIR}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\ninitrd\t/`basename ${DESTDIR}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
+ LINUX="title\tDebian GNU/Linux - Live\nroot\t(cd)\nkernel\t/`basename ${DESTDIR}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\ninitrd\t/`basename ${DESTDIR}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
else
DEFAULT_FLAVOUR="`echo ${LIVE_KERNEL_FLAVOUR} | awk '{ print $1 }'`"
- LINUX="title\tlinux\nroot\t(cd)\nkernel\t`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\ninitrd\tinitrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
+ LINUX="title\tDebian GNU/Linux - Live\nroot\t(cd)\nkernel\t`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\ninitrd\tinitrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
fi
if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ]
@@ -135,16 +131,16 @@
then
if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
then
- LINUX="title\tlinux-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nroot\t(cd)\nkernel\t/`basename ${DESTDIR}`/`basename ${KERNEL}`\ninitrd\t/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
+ LINUX="title\tDebian GNU/Linux - Live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nroot\t(cd)\nkernel\t/`basename ${DESTDIR}`/`basename ${KERNEL}`\ninitrd\t/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
else
- LINUX="title\tlinux-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nroot\t(cd)\nkernel\t`basename ${KERNEL}`\ninitrd\tinitrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
+ LINUX="title\tDebian GNU/Linux - Live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nroot\t(cd)\nkernel\t`basename ${KERNEL}`\ninitrd\tinitrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
fi
else
if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
then
- LINUX="${LINUX}\n\ntitle\tlinux-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nroot\t(cd)\nkernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\ninitrd\t/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
+ LINUX="${LINUX}\n\ntitle\tDebian GNU/Linux - Live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nroot\t(cd)\nkernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\ninitrd\t/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
else
- LINUX="${LINUX}\n\ntitle\tlinux-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nroot\t(cd)\nkernel `basename ${KERNEL}`\ninitrd\tinitrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
+ LINUX="${LINUX}\n\ntitle\tDebian GNU/Linux - Live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nroot\t(cd)\nkernel `basename ${KERNEL}`\ninitrd\tinitrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
fi
fi
done
@@ -157,10 +153,10 @@
then
if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
then
- MEMTEST="title\tmemtest\nroot\t(cd)\nkernel\t/`basename ${DESTDIR}`/memtest"
+ MEMTEST="title\tMemtest86+\nroot\t(cd)\nkernel\t/`basename ${DESTDIR}`/memtest"
MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
else
- MEMTEST="title\tmemtest\nroot\t(cd)\nkernel\tmemtest"
+ MEMTEST="title\tMemtest86+\nroot\t(cd)\nkernel\tmemtest"
fi
fi
@@ -178,25 +174,8 @@
fi
# Configure grub templates
- sed -i -e "s#LIVE_KERNEL#${LINUX}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/boot/grub/menu.lst
+ sed -i -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/boot/grub/menu.lst
sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/boot/grub/menu.lst
-
- # Working arround grub 8.3 limitation
- if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ]
- then
- for FLAVOUR in ${LIVE_KERNEL_FLAVOUR}
- do
- NUMBER=$(($NUMBER + 1))
-
- mv "${DESTDIR}"/vmlinuz-*-${FLAVOUR} "${DESTDIR}"/vmlinuz${NUMBER}
- mv "${DESTDIR}"/initrd.img-*-${FLAVOUR} "${DESTDIR}"/initrd${NUMBER}.img
- sed -i -e "s/linux.*-${FLAVOUR}/linux${NUMBER}/g" -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" binary/boot/grub/menu.lst
- done
- else
- mv "${DESTDIR}"/vmlinuz-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/vmlinuz
- mv "${DESTDIR}"/initrd.img-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/initrd.img
- sed -i -e "s/linux.*-${LIVE_KERNEL_FLAVOUR}/linux/g" -e "s/vmlinuz-.*-${LIVE_KERNEL_FLAVOUR}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_KERNEL_FLAVOUR}/initrd.img/g" binary/boot/grub/menu.lst
- fi
;;
esac
Modified: dists/trunk/live-helper/helpers/lh_binary_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_iso 2007-04-01 20:39:56 UTC (rev 916)
+++ dists/trunk/live-helper/helpers/lh_binary_iso 2007-04-02 10:49:56 UTC (rev 917)
@@ -78,12 +78,12 @@
if [ "${LIVE_SYSLINUX}" = "enabled" ]
then
#Chroot "${LH_GENISOIMAGE} -A \"Debian Live\" -p \"Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org\" -publisher \"Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org\" -o binary.iso -r -J -l -V \"${LIVE_ISO_VOLUME}\" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table binary"
- Chroot "${LH_GENISOIMAGE} -o binary.iso -r -J -l -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table binary"
+ Chroot "${LH_GENISOIMAGE} -o binary.iso -r -J -l -b isolinux/isolinux.bin -m isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table binary"
fi
if [ "${LIVE_GRUB}" = "enabled" ]
then
- Chroot "${LH_GENISOIMAGE} -o binary.iso -r -J -l -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table binary"
+ Chroot "${LH_GENISOIMAGE} -o binary.iso -r -J -l -b boot/grub/stage2_eltorito -m -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table binary"
fi
else
echo "W: Bootloader on your architecture not yet supported (Continuing in 5 seconds)."
Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux 2007-04-01 20:39:56 UTC (rev 916)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux 2007-04-02 10:49:56 UTC (rev 917)
@@ -178,7 +178,7 @@
fi
# Configure syslinux templates
- sed -i -e "s#LIVE_KERNEL#${LINUX}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/isolinux/isolinux.cfg
+ sed -i -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/isolinux/isolinux.cfg
sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/isolinux/isolinux.cfg
sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" binary/isolinux/f1.txt
sed -i -e "s/LIVE_VERSION/${VERSION}/" binary/isolinux/f10.txt
@@ -221,7 +221,7 @@
fi
# Configure syslinux templates
- sed -i -e "s#LIVE_KERNEL#${LINUX}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" tftpboot/pxelinux.cfg/default
+ sed -i -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" tftpboot/pxelinux.cfg/default
sed -i -e "s/LIVE_SERVER_ADDRESS/${LIVE_SERVER_ADDRESS}/" -e "s#LIVE_SERVER_PATH#${LIVE_SERVER_PATH}#" -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" tftpboot/pxelinux.cfg/default
sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" tftpboot/pxelinux.cfg/f1.txt
sed -i -e "s/LIVE_VERSION/${VERSION}/" tftpboot/pxelinux.cfg/f10.txt
@@ -263,7 +263,7 @@
fi
# Configure syslinux templates
- sed -i -e "s#LIVE_KERNEL#${LINUX}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/syslinux.cfg
+ sed -i -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/syslinux.cfg
sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/syslinux.cfg
sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" binary/f1.txt
sed -i -e "s/LIVE_VERSION/${VERSION}/" binary/f10.txt
Modified: dists/trunk/live-helper/templates/grub/menu.lst
===================================================================
--- dists/trunk/live-helper/templates/grub/menu.lst 2007-04-01 20:39:56 UTC (rev 916)
+++ dists/trunk/live-helper/templates/grub/menu.lst 2007-04-02 10:49:56 UTC (rev 917)
@@ -115,8 +115,10 @@
## ## End Default Options ##
-LIVE_KERNEL
+LIVE_KERNEL_LIVE
+LIVE_KERNEL_INSTALL
+
LIVE_MEMTEST
### END DEBIAN AUTOMAGIC KERNELS LIST
Modified: dists/trunk/live-helper/templates/syslinux/isolinux.cfg
===================================================================
--- dists/trunk/live-helper/templates/syslinux/isolinux.cfg 2007-04-01 20:39:56 UTC (rev 916)
+++ dists/trunk/live-helper/templates/syslinux/isolinux.cfg 2007-04-02 10:49:56 UTC (rev 917)
@@ -1,5 +1,6 @@
default linux
-LIVE_KERNEL
+LIVE_KERNEL_LIVE
+LIVE_KERNEL_INSTALL
LIVE_MEMTEST
display isolinux.txt
timeout 0
More information about the Debian-live-changes
mailing list