[Debian-live-changes] r2037 - in dists/trunk/live-helper: docs helpers
daniel at alioth.debian.org
daniel at alioth.debian.org
Mon Jun 11 10:55:47 UTC 2007
Author: daniel
Date: 2007-06-11 10:55:47 +0000 (Mon, 11 Jun 2007)
New Revision: 2037
Modified:
dists/trunk/live-helper/docs/ChangeLog
dists/trunk/live-helper/helpers/lh_binary_debian-installer
dists/trunk/live-helper/helpers/lh_binary_linux-image
dists/trunk/live-helper/helpers/lh_binary_memtest
dists/trunk/live-helper/helpers/lh_binary_syslinux
Log:
Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog 2007-06-11 10:22:54 UTC (rev 2036)
+++ dists/trunk/live-helper/docs/ChangeLog 2007-06-11 10:55:47 UTC (rev 2037)
@@ -1,5 +1,8 @@
2007-06-10 Daniel Baumann <daniel at debian.org>
+ * helpers/*:
+ - Excluding lenny from the syslinux workarounds as syslinux 3.36 did
+ migrate into testing.
* helpers/lh_clean:
- Added unmount of binfmt on clean.
Modified: dists/trunk/live-helper/helpers/lh_binary_debian-installer
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_debian-installer 2007-06-11 10:22:54 UTC (rev 2036)
+++ dists/trunk/live-helper/helpers/lh_binary_debian-installer 2007-06-11 10:55:47 UTC (rev 2037)
@@ -68,7 +68,7 @@
tar|usb-hdd)
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ]
then
if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
then
@@ -110,7 +110,7 @@
mkdir -p "${DESTDIR}"
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
-if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+if [ "${LIVE_DISTRIBUTION}" = "etch" ]
then
if [ "${LIVE_BINARY_IMAGES}" = "tar" ] || [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]
then
@@ -135,7 +135,7 @@
if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
then
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ]
then
if [ "${LIVE_BINARY_IMAGES}" = "tar" ] || [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]
then
Modified: dists/trunk/live-helper/helpers/lh_binary_linux-image
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_linux-image 2007-06-11 10:22:54 UTC (rev 2036)
+++ dists/trunk/live-helper/helpers/lh_binary_linux-image 2007-06-11 10:55:47 UTC (rev 2037)
@@ -61,7 +61,7 @@
tar|usb-hdd)
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ]
then
if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
then
Modified: dists/trunk/live-helper/helpers/lh_binary_memtest
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_memtest 2007-06-11 10:22:54 UTC (rev 2036)
+++ dists/trunk/live-helper/helpers/lh_binary_memtest 2007-06-11 10:55:47 UTC (rev 2037)
@@ -83,7 +83,7 @@
tar|usb-hdd)
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ]
then
if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
then
Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux 2007-06-11 10:22:54 UTC (rev 2036)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux 2007-06-11 10:55:47 UTC (rev 2037)
@@ -105,7 +105,7 @@
tar|usb-hdd)
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ]
then
DESTDIR_LIVE="binary"
DESTDIR_INSTALL="binary"
@@ -236,7 +236,7 @@
if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
then
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ]
then
if [ "${LIVE_BINARY_IMAGES}" = "tar" ] || [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]
then
@@ -451,7 +451,7 @@
tar|usb-hdd)
# Workaround for syslinux (<< 3.36) which doesn't support dedicated directory
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ]
then
DESTDIR="binary"
else
@@ -491,7 +491,7 @@
rm -f "${DESTDIR}"/pxelinux.cfg
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ]
then
if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
then
More information about the Debian-live-changes
mailing list