[Debian-live-changes] r2434 - dists/trunk/live-helper/helpers
daniel at alioth.debian.org
daniel at alioth.debian.org
Mon Jul 9 09:01:39 UTC 2007
Author: daniel
Date: 2007-07-09 09:01:39 +0000 (Mon, 09 Jul 2007)
New Revision: 2434
Modified:
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/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub 2007-07-09 08:38:20 UTC (rev 2433)
+++ dists/trunk/live-helper/helpers/lh_binary_grub 2007-07-09 09:01:39 UTC (rev 2434)
@@ -83,6 +83,11 @@
INITRD="${3}"
APPEND="${4}"
+ if [ "${LIVE_DISTRIBUTION}" != "etch" ] && [ "${LABEL}" != "rescue" ] && [ "${LABEL}" != "rescuegui" ]
+ then
+ APPEND="${APPEND} quiet"
+ fi
+
LINUX_INSTALL="${LINUX_INSTALL}\ntitle\t\tDebian GNU/Linux - ${LABEL}"
LINUX_INSTALL="${LINUX_INSTALL}\nkernel\t\t/${KERNEL} ${APPEND} --"
LINUX_INSTALL="${LINUX_INSTALL}\ninitrd\t\t/${INITRD}"
@@ -198,26 +203,14 @@
DEFAULT_KERNEL="`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`"
DEFAULT_INITRD="initrd.img-`echo ${DEFAULT_KERNEL} | sed -e 's/vmlinuz-//'`"
-if [ "${LIVE_DISTRIBUTION}" = "etch" ]
-then
- Grub_live_entry "live" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
-else
- Grub_live_entry "live" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" "quiet"
-fi
-
+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*
do
VERSION="`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
- if [ "${LIVE_DISTRIBUTION}" = "etch" ]
- then
- Grub_live_entry "live, kernel ${VERSION}" "`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`" "`basename ${DESTDIR_LIVE}`/initrd.img-${VERSION}"
- else
- Grub_live_entry "live, kernel ${VERSION}" "`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`" "`basename ${DESTDIR_LIVE}`/initrd.img-${VERSION}" "quiet"
- fi
-
+ Grub_live_entry "live, kernel ${VERSION}" "`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`" "`basename ${DESTDIR_LIVE}`/initrd.img-${VERSION}"
Grub_live_entry "live, kernel ${VERSION} (fail-safe mode)" "`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`" "`basename ${DESTDIR_LIVE}`/initrd.img-${VERSION}" "${FAILSAFE}"
done
@@ -231,24 +224,12 @@
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
-
Grub_install_entry "install" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
Grub_install_entry "installgui" "${VMLINUZ_GI}" "${INITRD_GI}" "${APPEND_GI}"
Grub_install_entry "expert" "${VMLINUZ_DI}" "${INITRD_DI}" "priority=low ${APPEND_DI}"
Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux 2007-07-09 08:38:20 UTC (rev 2433)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux 2007-07-09 09:01:39 UTC (rev 2434)
@@ -99,6 +99,11 @@
INITRD="${DIRECTORY}/${INITRD}"
fi
+ if [ "${LIVE_DISTRIBUTION}" != "etch" ] && [ "${LABEL}" != "rescue" ] && [ "${LABEL}" != "rescuegui" ]
+ then
+ APPEND="${APPEND} quiet"
+ fi
+
LINUX_INSTALL="${LINUX_INSTALL}\nLABEL ${LABEL}\n"
LINUX_INSTALL="${LINUX_INSTALL}\tkernel /${KERNEL}\n"
LINUX_INSTALL="${LINUX_INSTALL}\tappend initrd=/${INITRD} ${APPEND} --\n"
@@ -235,13 +240,7 @@
DEFAULT_KERNEL="`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`"
DEFAULT_INITRD="initrd.img-`echo ${DEFAULT_KERNEL} | sed -e 's/vmlinuz-//'`"
-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" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
Syslinux_live_entry "live-failsafe" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" "${FAILSAFE}"
if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
@@ -252,13 +251,7 @@
KERNEL_VERSION="`echo ${KERNEL_IMAGE} | sed -e 's/vmlinuz-//'`"
INITRD="initrd.img-${KERNEL_VERSION}"
- 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}" "${KERNEL_IMAGE}" "${INITRD}"
Syslinux_live_entry "live-${KERNEL_VERSION}-failsafe" "${KERNEL_IMAGE}" "${INITRD}" "${FAILSAFE}"
done
fi
@@ -270,24 +263,12 @@
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
Modified: dists/trunk/live-helper/helpers/lh_binary_yaboot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_yaboot 2007-07-09 08:38:20 UTC (rev 2433)
+++ dists/trunk/live-helper/helpers/lh_binary_yaboot 2007-07-09 09:01:39 UTC (rev 2434)
@@ -89,11 +89,16 @@
DIRECTORY="/`basename ${DESTDIR_LIVE}`"
- LINUX_LIVE="${LINUX_LIVE}\nimage=${DIRECTORY}/${KERNEL}\n"
- LINUX_LIVE="${LINUX_LIVE}\tlabel=${LABEL}\n"
- LINUX_LIVE="${LINUX_LIVE}\tinitrd=${DIRECTORY}/${INITRD}\n"
- LINUX_LIVE="${LINUX_LIVE}\tappend=\"LIVE_BOOTAPPEND ${APPEND} --\"\n"
- LINUX_LIVE="${LINUX_LIVE}\tinitrd-size=10240\n"
+ if [ "${LIVE_DISTRIBUTION}" != "etch" ] && [ "${LABEL}" != "rescue" ] && [ "${LABEL}" != "rescuegui" ]
+ then
+ APPEND="${APPEND} quiet"
+ fi
+
+ LINUX_INSTALL="${LINUX_INSTALL}\nimage=${DIRECTORY}/${KERNEL}\n"
+ LINUX_INSTALL="${LINUX_INSTALL}\tlabel=${LABEL}\n"
+ LINUX_INSTALL="${LINUX_INSTALL}\tinitrd=${DIRECTORY}/${INITRD}\n"
+ LINUX_INSTALL="${LINUX_INSTALL}\tappend=\"LIVE_BOOTAPPEND ${APPEND} --\"\n"
+ LINUX_INSTALL="${LINUX_INSTALL}\tinitrd-size=10240\n"
}
case "${LH_INITRAMFS}" in
More information about the Debian-live-changes
mailing list