[Debian-live-changes] r2432 - dists/trunk/live-helper/helpers
daniel at alioth.debian.org
daniel at alioth.debian.org
Sun Jul 8 19:48:37 UTC 2007
Author: daniel
Date: 2007-07-08 19:48:37 +0000 (Sun, 08 Jul 2007)
New Revision: 2432
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-07-07 14:17:45 UTC (rev 2431)
+++ dists/trunk/live-helper/helpers/lh_binary_grub 2007-07-08 19:48:37 UTC (rev 2432)
@@ -71,8 +71,8 @@
INITRD="${3}"
APPEND="${4}"
- LINUX_LIVE="${LINUX_LIVE}\ntitle\t\tDebian GNU/Linux - ${LABEL}\n"
- LINUX_LIVE="${LINUX_LIVE}\nkernel\t\t/${KERNEL} boot=${INITFS} LIVE_BOOTAPPEND ${APPEND}\n"
+ LINUX_LIVE="${LINUX_LIVE}\ntitle\t\tDebian GNU/Linux - ${LABEL}"
+ LINUX_LIVE="${LINUX_LIVE}\nkernel\t\t/${KERNEL} boot=${INITFS} LIVE_BOOTAPPEND ${APPEND}"
LINUX_LIVE="${LINUX_LIVE}\ninitrd\t\t/${INITRD}"
}
@@ -83,8 +83,8 @@
INITRD="${3}"
APPEND="${4}"
- LINUX_INSTALL="${LINUX_INSTALL}\ntitle\t\tDebian GNU/Linux - ${LABEL}\n"
- LINUX_INSTALL="${LINUX_INSTALL}\nkernel\t\t/${KERNEL} ${APPEND} --\n"
+ 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}"
}
@@ -265,7 +265,7 @@
if [ -f "${DESTDIR_LIVE}"/memtest ]
then
MEMTEST="title\t\tOther:\nroot"
- MEMTEST="title\t\t${LIVE_MEMTEST}\nkernel\t\t/`basename ${DESTDIR_LIVE}`/memtest"
+ MEMTEST="${MEMTEST}\n\ntitle\t\t${LIVE_MEMTEST}\nkernel\t\t/`basename ${DESTDIR_LIVE}`/memtest"
MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
fi
More information about the Debian-live-changes
mailing list