From 10f1ae01cc15fa0537cd02d0f7ba9be72d83099c Mon Sep 17 00:00:00 2001
From: Frans Pop <fjp@debian.org>
Date: Mon, 5 Sep 2005 21:05:05 +0000
Subject: [PATCH] Update for Sparc: - sparc64: switch to 2.6.12 kernel; make CD
 multiboot 2.6 and 2.4,   using 2.6.12 by default - sparc32: drop 2.6 kernel
 support as it has no 2.6.12 kernel - restructure silo.conf with proper
 support for install, expert and   rescue boot options

---
 data/etch/sparc/silo.conf  | 58 +++++++++++++++++++++++++++++---------
 debian/changelog           | 12 ++++++++
 tools/boot/etch/boot-sparc | 13 ++++++++-
 3 files changed, 68 insertions(+), 15 deletions(-)

diff --git a/data/etch/sparc/silo.conf b/data/etch/sparc/silo.conf
index 9280ac2a..b2a07efb 100644
--- a/data/etch/sparc/silo.conf
+++ b/data/etch/sparc/silo.conf
@@ -1,21 +1,51 @@
 partition=1
 timeout=600
 message=/boot/debian.txt
-default=linux
-append="cdrom ramdisk_size=16384 devfs=mount rw"
-initrd=/boot/initrd.gz
-root=/dev/rd/0
+default=install
+append="cdrom ramdisk_size=16384"
+root=/dev/ram
 
-# Standard boot images
-image[sun4c,sun4d,sun4m]=/boot/sparc32
-   label=linux
+### sparc64 boot images
+image[sun4u]=/boot/2.6/sparc64
+   label=install
+   initrd=/boot/2.6/initrd.gz
 image[sun4u]=/boot/sparc64
-   label=linux
+   label=install24
+   initrd=/boot/initrd.gz
 
-# Rescue boots
-image[sun4c,sun4d,sun4m]=/boot/sparc32
-  label=rescue
-  append="init=/bin/sh"
+# sparc64 expert boots
+image[sun4u]=/boot/2.6/sparc64
+   label=expert
+   initrd=/boot/2.6/initrd.gz
+   append="debconf/priority=low"
 image[sun4u]=/boot/sparc64
-  label=rescue
-  append="init=/bin/sh"
+   label=expert24
+   initrd=/boot/initrd.gz
+   append="debconf/priority=low"
+
+# sparc64 rescue boots
+image[sun4u]=/boot/2.6/sparc64
+   label=rescue
+   initrd=/boot/2.6/initrd.gz
+   append="rescue/enable=true"
+image[sun4u]=/boot/sparc64
+   label=rescue24
+   initrd=/boot/initrd.gz
+   append="rescue/enable=true"
+
+### sparc32 boot images
+image[sun4c,sun4d,sun4m]=/boot/sparc32
+   label=install
+   initrd=/boot/initrd.gz
+
+# sparc32 expert boots
+image[sun4c,sun4d,sun4m]=/boot/sparc32
+   label=expert
+   initrd=/boot/initrd.gz
+   append="debconf/priority=low"
+
+# sparc32 rescue boots
+image[sun4c,sun4d,sun4m]=/boot/sparc32
+   label=rescue
+   initrd=/boot/initrd.gz
+   append="rescue/enable=true"
diff --git a/debian/changelog b/debian/changelog
index 36797fcd..c96ace03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+debian-cd (2.2.24) UNRELEASED; urgency=low
+
+  * Frans Pop
+    - Update for Sparc:
+      - sparc64: switch to 2.6.12 kernel; make CD multiboot 2.6 and 2.4,
+        using 2.6.12 by default
+      - sparc32: drop 2.6 kernel support as it has no 2.6.12 kernel
+      - restructure silo.conf with proper support for install, expert and
+        rescue boot options
+
+ -- Frans Pop <fjp@debian.org>  Mon,  5 Sep 2005 22:58:18 +0200
+
 debian-cd (2.2.23) unstable; urgency=low
 
   * Raphael Hertzog
diff --git a/tools/boot/etch/boot-sparc b/tools/boot/etch/boot-sparc
index 89981d90..683fbf2c 100755
--- a/tools/boot/etch/boot-sparc
+++ b/tools/boot/etch/boot-sparc
@@ -36,7 +36,7 @@ rm -rf boot1
 inst=boot1
 
 # Setup directories
-mkdir -p $inst/boot
+mkdir -p $inst/boot/2.6
 
 silo_deb=`ls $MIRROR/pool/main/s/silo/silo_*.deb | tail -1`
 # put the relevant parts of SILO boot loader
@@ -67,7 +67,18 @@ else
 	wget "$DI_WWW_HOME/$sparc32" -O vmlinuz-x-sparc32
 	wget "$DI_WWW_HOME/$sparc64" -O vmlinuz-x-sparc64
 	wget "$DI_WWW_HOME/initrd.gz"
+
+	mkdir ./2.6
+	DI_WWW_HOME=$DI_WWW_HOME/2.6
+	wget "$DI_WWW_HOME" -O ./2.6/di.dir
+	sparc64=$(sed -n 's/.*a href="\(vmlinuz-.*-sparc64\)".*/\1/p' ./2.6/di.dir)
+	wget "$DI_WWW_HOME/$sparc64" -O ./2.6/vmlinuz-x-sparc64
+	wget "$DI_WWW_HOME/initrd.gz" -O ./2.6/initrd.gz
 fi
+
 cp "$DI_DIR"/initrd.gz "$inst/boot/initrd.gz"
 cp "$DI_DIR"/vmlinuz-*-sparc32 "$inst/boot/sparc32"
 zcat "$DI_DIR"/vmlinuz-*-sparc64 > "$inst/boot/sparc64"
+
+cp "$DI_DIR"/2.6/initrd.gz "$inst/boot/2.6/initrd.gz"
+zcat "$DI_DIR"/2.6/vmlinuz-*-sparc64 > "$inst/boot/2.6/sparc64"