[Debian-live-changes] r2395 - dists/trunk/live-helper/helpers
daniel at alioth.debian.org
daniel at alioth.debian.org
Wed Jul 4 09:09:14 UTC 2007
Author: daniel
Date: 2007-07-04 09:09:14 +0000 (Wed, 04 Jul 2007)
New Revision: 2395
Modified:
dists/trunk/live-helper/helpers/lh_binary_syslinux
Log:
Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux 2007-07-04 07:13:52 UTC (rev 2394)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux 2007-07-04 09:09:14 UTC (rev 2395)
@@ -235,7 +235,13 @@
DEFAULT_KERNEL="`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`"
DEFAULT_INITRD="initrd.img-`echo ${DEFAULT_KERNEL} | sed -e 's/vmlinuz-//'`"
-Syslinux_live_entry "live" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
+if [ "${LIVE_DISTRIBUTION}" = "etch" ]
+then
+ Syslinux_live_entry "live" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
+else
+ Syslinux_live_entry "live" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" "quiet"
+fi
+
Syslinux_live_entry "live-failsafe" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" "${FAILSAFE}"
if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
@@ -246,7 +252,13 @@
KERNEL_VERSION="`echo ${KERNEL_IMAGE} | sed -e 's/vmlinuz-//'`"
INITRD="initrd.img-${KERNEL_VERSION}"
- Syslinux_live_entry "live-${KERNEL_VERSION}" "${KERNEL_IMAGE}" "${INITRD}"
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ]
+ then
+ Syslinux_live_entry "live-${KERNEL_VERSION}" "${KERNEL_IMAGE}" "${INITRD}"
+ else
+ Syslinux_live_entry "live-${KERNEL_VERSION}" "${KERNEL_IMAGE}" "${INITRD}" "quiet"
+ fi
+
Syslinux_live_entry "live-${KERNEL_VERSION}-failsafe" "${KERNEL_IMAGE}" "${INITRD}" "${FAILSAFE}"
done
fi
@@ -258,12 +270,24 @@
then
VMLINUZ_DI="vmlinuz"
INITRD_DI="initrd.gz"
- APPEND_DI="vga=normal"
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ]
+ then
+ APPEND_DI="vga=normal"
+ else
+ APPEND_DI="vga=normal quiet"
+ fi
+
VMLINUZ_GI="gtk/vmlinuz"
INITRD_GI="gtk/initrd.gz"
- APPEND_GI="video=vesa:ywrap,mtrr vga=788"
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ]
+ then
+ APPEND_GI="video=vesa:ywrap,mtrr vga=788"
+ else
+ APPEND_GI="video=vesa:ywrap,mtrr vga=788 quiet"
+ fi
+
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
if [ "${LIVE_DISTRIBUTION}" = "etch" ]
then
More information about the Debian-live-changes
mailing list