[SCM] debian-live branch, master, updated. 1.0_a47-1-61-g3b540b4

Chris Lamb chris at chris-lamb.co.uk
Fri Jul 4 21:36:33 UTC 2008


The following commit has been merged in the master branch:
commit 6c1152882976cd27b53d4478830cdc5a0d2f5d0e
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Fri Jul 4 22:26:35 2008 +0100

    Only consider linux-image-2.6-prep powerpc kernel image on Etch.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 208d4b8..2a79521 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -340,7 +340,12 @@ then
 			;;
 
 		powerpc)
-			DI_PACKAGES="linux-image-2.6-powerpc linux-image-2.6-powerpc64 linux-image-2.6-powerpc-smp linux-image-2.6-prep yaboot" # FIXME bootloader?
+			DI_PACKAGES="linux-image-2.6-powerpc linux-image-2.6-powerpc64 linux-image-2.6-powerpc-smp yaboot" # FIXME bootloader?
+
+			if [ "${LH_DISTRIBUTION}" = "etch" ]
+			then
+				DI_PACKAGES="${DI_PACKAGES} linux-image-2.6-prep"
+			fi
 			;;
 	esac
 

-- 
debian-live



More information about the debian-live-changes mailing list