[SCM] debian-live branch, master, updated. 1.0_a47-1-31-g2b77ec6

[Chris Lamb]

The following commit has been merged in the master branch:
commit 766cd2670cfef096cde94d2f90c5499a4dac290e
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sun Jun 15 04:46:51 2008 +0100

    Add support for the sparc architecture.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 7f635b0..f213c81 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -511,6 +511,10 @@ Set_defaults ()
 			powerpc)
 				LH_BOOTLOADER="yaboot"
 				;;
+
+			sparc)
+				LH_BOOTLOADER="silo"
+				;;
 		esac
 	fi
 
diff --git a/helpers/lh_binary b/helpers/lh_binary
index e8ca415..090d32e 100755
--- a/helpers/lh_binary
+++ b/helpers/lh_binary
@@ -56,6 +56,7 @@ lh_binary_memtest ${*}
 lh_binary_grub ${*}
 lh_binary_syslinux ${*}
 lh_binary_yaboot ${*}
+lh_binary_silo ${*}
 lh_binary_disk ${*}
 lh_binary_includes ${*}
 lh_binary_local-includes ${*}
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso
index aa2e6db..7d762af 100755
--- a/helpers/lh_binary_iso
+++ b/helpers/lh_binary_iso
@@ -100,6 +100,11 @@ case "${LH_BOOTLOADER}" in
 		GENISOIMAGE_EXCLUDE="boot/grub/stage2_eltorito"
 		;;
 
+	silo)
+		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -G boot/isofs.b -B ..."
+		GENISOIMAGE_EXCLUDE="boot/isofs.b"
+		;;
+
 	syslinux)
 		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
 		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b isolinux/isolinux.bin -c isolinux/boot.cat"
diff --git a/helpers/lh_binary_linux-image b/helpers/lh_binary_linux-image
index 0419090..a4a3443 100755
--- a/helpers/lh_binary_linux-image
+++ b/helpers/lh_binary_linux-image
@@ -64,6 +64,10 @@ case "${LH_ARCHITECTURE}" in
 	powerpc)
 		LINUX="vmlinux"
 		;;
+
+	sparc)
+		LINUX="vmlinuz"
+		;;
 esac
 
 Check_multiarchitecture

-- 
debian-live