[Debian-live-changes] r913 - dists/trunk/live-helper/helpers
Daniel Baumann
daniel at alioth.debian.org
Sun Apr 1 19:42:42 UTC 2007
Author: daniel
Date: 2007-04-01 19:42:42 +0000 (Sun, 01 Apr 2007)
New Revision: 913
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-04-01 19:11:43 UTC (rev 912)
+++ dists/trunk/live-helper/helpers/lh_binary_grub 2007-04-01 19:42:42 UTC (rev 913)
@@ -71,7 +71,7 @@
# Setting destination directory
case "${LIVE_BINARY_IMAGE}" in
iso)
- DESTDIR="binary/boot/grub"
+ DESTDIR="binary/live"
;;
net)
@@ -83,6 +83,16 @@
;;
esac
+ # Temporary check for broken syslinux
+ if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
+ then
+ case "${LIVE_ARCHITECTURE}" in
+ i386)
+ DESTDIR="${DESTDIR}.386"
+ ;;
+ esac
+ fi
+
# Creating directory
if [ ! -d "${DESTDIR}" ]
then
@@ -157,19 +167,19 @@
case "${LIVE_BINARY_IMAGE}" in
iso)
# Copying grub
- mkdir -p "${DESTDIR}"
- cp chroot/usr/lib/grub/i386-pc/stage2_eltorito "${DESTDIR}"
- cp -r "${LIVE_TEMPLATES}"/grub/* "${DESTDIR}"
+ mkdir -p binary/boot/grub
+ cp chroot/usr/lib/grub/i386-pc/stage2_eltorito binary/boot/grub
+ cp -r "${LIVE_TEMPLATES}"/grub/* binary/boot/grub
# Copying splash screen
if [ -n "${LIVE_GRUB_SPLASH}" ]
then
- cp "${LIVE_GRUB_SPLASH}" "${DESTDIR}"
+ cp "${LIVE_GRUB_SPLASH}" binary/boot/grub
fi
# Configure grub templates
- sed -i -e "s#LIVE_KERNEL#${LINUX}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" "${DESTDIR}"/menu.lst
- sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" "${DESTDIR}"/menu.lst
+ sed -i -e "s#LIVE_KERNEL#${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" ]
@@ -180,12 +190,12 @@
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" "${DESTDIR}"/menu.lst
+ 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" "${DESTDIR}"/menu.lst
+ 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
More information about the Debian-live-changes
mailing list