[SCM] debian-live branch, master, updated. 1.0_a47-1-54-gbcd8472

[Chris Lamb]

The following commit has been merged in the master branch:
commit ec998961a8e378a44df47010022be3ff9af52131
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Fri Jun 20 01:35:07 2008 +0100

    Refactor destination setting in lh_binary_silo to check arguments at beginning of the script.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_binary_silo b/helpers/lh_binary_silo
index 0c0531a..42d57fd 100755
--- a/helpers/lh_binary_silo
+++ b/helpers/lh_binary_silo
@@ -33,6 +33,17 @@ then
 	exit 0
 fi
 
+# Check image type
+case "${LH_BINARY_IMAGES}" in
+	iso|usb-hdd)
+		;;
+
+	net|tar)
+		Echo_error "not yet supported, aborting (FIXME)."
+		exit 1
+		;;
+esac
+
 Echo_message "Begin installing silo..."
 
 # Requiring stage file
@@ -98,38 +109,20 @@ Silo_install_entry ()
 	LINUX_INSTALL="${LINUX_INSTALL}\t  append=\"LH_BOOTAPPEND_LIVE ${APPEND} LH_BOOTAPPEND_INSTALL\"\n"
 }
 
+# Setting destination directories
+DESTDIR_INSTALL="binary/install"
 case "${LH_INITRAMFS}" in
 	casper)
 		INITFS="casper"
+		DESTDIR_LIVE="binary/casper"
 		;;
 
 	live-initramfs)
 		INITFS="live"
+		DESTDIR_LIVE="binary/live"
 		;;
 esac
 
-# Setting destination directory
-case "${LH_BINARY_IMAGES}" in
-	iso|usb-hdd)
-		case "${LH_INITRAMFS}" in
-			casper)
-				DESTDIR_LIVE="binary/casper"
-				;;
-
-			live-initramfs)
-				DESTDIR_LIVE="binary/live"
-				;;
-		esac
-
-		DESTDIR_INSTALL="binary/install"
-		;;
-
-	net|tar)
-		Echo_error "not yet supported, aborting (FIXME)."
-		exit 1
-	;;
-esac
-
 # Creating directory
 mkdir -p "${DESTDIR_LIVE}"
 

-- 
debian-live