From ff146a5d793e980505dae0a2795bf90f1097fa1b Mon Sep 17 00:00:00 2001
From: Frans Pop <fjp@debian.org>
Date: Wed, 18 Jul 2007 07:39:59 +0000
Subject: [PATCH] Disable sparc32 for Lenny images as it is no longer supported

---
 data/lenny/sparc/silo.conf  | 30 +++++++++++++++---------------
 debian/changelog            |  3 ++-
 tools/boot/lenny/boot-sparc |  6 +++---
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/data/lenny/sparc/silo.conf b/data/lenny/sparc/silo.conf
index 6b514304..c8f17134 100644
--- a/data/lenny/sparc/silo.conf
+++ b/data/lenny/sparc/silo.conf
@@ -28,24 +28,24 @@ image[sun4u]=/boot/sparc64
    append="auto=true priority=critical"
 
 ### sparc32 boot images
-image[sun4c,sun4d,sun4m]=/boot/sparc32
-   label=install
-   initrd=/boot/initrd.gz
+#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"
+#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"
+#image[sun4c,sun4d,sun4m]=/boot/sparc32
+#   label=rescue
+#   initrd=/boot/initrd.gz
+#   append="rescue/enable=true"
 
 # sparc32 auto-install boots
-image[sun4c,sun4d,sun4m]=/boot/sparc32
-   label=auto
-   initrd=/boot/initrd.gz
-   append="auto=true priority=critical"
+#image[sun4c,sun4d,sun4m]=/boot/sparc32
+#   label=auto
+#   initrd=/boot/initrd.gz
+#   append="auto=true priority=critical"
diff --git a/debian/changelog b/debian/changelog
index a54801bb..dcffc20c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,8 +44,9 @@ debian-cd (3.0.3) UNRELEASED; urgency=low
     Xfce CD images; now they only help to confuse.
   * Exclude live-installer, simple-cdd, pwgen and nbd udebs as they are
     currently not used in Debian Installer.
+  * Disable sparc32 for Lenny images as it is no longer supported.
 
- -- Frans Pop <fjp@debian.org>  Fri, 13 Jul 2007 02:06:31 +0200
+ -- Frans Pop <fjp@debian.org>  Wed, 18 Jul 2007 01:05:42 +0200
 
 debian-cd (3.0.2) unstable; urgency=high
 
diff --git a/tools/boot/lenny/boot-sparc b/tools/boot/lenny/boot-sparc
index 83ebc6a1..bdaa5134 100755
--- a/tools/boot/lenny/boot-sparc
+++ b/tools/boot/lenny/boot-sparc
@@ -64,13 +64,13 @@ else
 	mkdir ./2.6
 	DI_WWW_HOME=$DI_WWW_HOME/2.6
 	wget "$DI_WWW_HOME" -O ./2.6/di.dir
-	sparc32=$(sed -n 's/.*a href="\(vmlinuz-.*-sparc32\)".*/\1/p' ./2.6/di.dir)
+	#sparc32=$(sed -n 's/.*a href="\(vmlinuz-.*-sparc32\)".*/\1/p' ./2.6/di.dir)
 	sparc64=$(sed -n 's/.*a href="\(vmlinuz-.*-sparc64\)".*/\1/p' ./2.6/di.dir)
-	wget "$DI_WWW_HOME/$sparc32" -O ./2.6/vmlinuz-x-sparc32
+	#wget "$DI_WWW_HOME/$sparc32" -O ./2.6/vmlinuz-x-sparc32
 	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"/2.6/initrd.gz "$inst/boot/initrd.gz"
-cp "$DI_DIR"/2.6/vmlinuz-*-sparc32 "$inst/boot/sparc32"
+#cp "$DI_DIR"/2.6/vmlinuz-*-sparc32 "$inst/boot/sparc32"
 zcat "$DI_DIR"/2.6/vmlinuz-*-sparc64 > "$inst/boot/sparc64"