[Debian-live-changes] r2098 - dists/trunk/live-helper/helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-06-15 10:48:36 +0000 (Fri, 15 Jun 2007)
New Revision: 2098

Modified:
   dists/trunk/live-helper/helpers/lh_binary_debian-installer
   dists/trunk/live-helper/helpers/lh_binary_memtest
   dists/trunk/live-helper/helpers/lh_binary_syslinux
Log:


Modified: dists/trunk/live-helper/helpers/lh_binary_debian-installer
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_debian-installer	2007-06-15 10:02:42 UTC (rev 2097)
+++ dists/trunk/live-helper/helpers/lh_binary_debian-installer	2007-06-15 10:48:36 UTC (rev 2098)
@@ -67,20 +67,14 @@
 		;;
 
 	tar|usb-hdd)
+		DESTDIR="binary/install"
+		DI="hd-media"
+
 		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
-		if [ "${LIVE_DISTRIBUTION}" = "etch" ]
+		if [ "${LIVE_DISTRIBUTION}" = "etch" ] && [ "${LIVE_BOOTLOADER}" = "syslinux" ]
 		then
-			if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
-			then
-				DESTDIR="binary"
-			else
-				DESTDIR="binary/install"
-			fi
-		else
-			DESTDIR="binary/install"
+			DESTDIR="binary"
 		fi
-
-		DI="hd-media"
 		;;
 esac
 

Modified: dists/trunk/live-helper/helpers/lh_binary_memtest
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_memtest	2007-06-15 10:02:42 UTC (rev 2097)
+++ dists/trunk/live-helper/helpers/lh_binary_memtest	2007-06-15 10:48:36 UTC (rev 2098)
@@ -85,12 +85,9 @@
 		DESTDIR="binary/live"
 
 		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
-		if [ "${LIVE_DISTRIBUTION}" = "etch" ]
+		if [ "${LIVE_DISTRIBUTION}" = "etch" ] && [ "${LIVE_BOOTLOADER}" = "syslinux" ]
 		then
-			if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
-			then
-				DESTDIR="binary"
-			fi
+			DESTDIR="binary"
 		fi
 		;;
 esac

Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-06-15 10:02:42 UTC (rev 2097)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-06-15 10:48:36 UTC (rev 2098)
@@ -104,14 +104,14 @@
 	;;
 
 	tar|usb-hdd)
+		DESTDIR_LIVE="binary/live"
+		DESTDIR_INSTALL="binary/install"
+
 		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
 		if [ "${LIVE_DISTRIBUTION}" = "etch" ]
 		then
 			DESTDIR_LIVE="binary"
 			DESTDIR_INSTALL="binary"
-		else
-			DESTDIR_LIVE="binary/live"
-			DESTDIR_INSTALL="binary/install"
 		fi
 		;;
 esac
@@ -235,6 +235,12 @@
 # Assembling debian-installer configuration
 if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
 then
+	VMLINUZ_DI="vmlinuz"
+	INITRD_DI="initrd.gz"
+
+	VMLINUZ_GI="gtk/vmlinuz"
+	INITRD_GI="gtk/initrd.gz"
+
 	# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
 	if [ "${LIVE_DISTRIBUTION}" = "etch" ]
 	then
@@ -245,19 +251,7 @@
 
 			VMLINUZ_GI="vmlinuz.gi"
 			INITRD_GI="initrdgi.gz"
-		else
-			VMLINUZ_DI="vmlinuz"
-			INITRD_DI="initrd.gz"
-
-			VMLINUZ_GI="gtk/vmlinuz"
-			INITRD_GI="gtk/initrd.gz"
 		fi
-	else
-		VMLINUZ_DI="vmlinuz"
-		INITRD_DI="initrd.gz"
-
-		VMLINUZ_GI="gtk/vmlinuz"
-		INITRD_GI="gtk/initrd.gz"
 	fi
 
 	# Workaround for syslinux (<< 3.36) which doesn't support long file/path names