Sync with what we run at gluck, basically this meant:

- Remove ramdisk_size param of silo.conf.
- Add initrd-tools to sparc di+k list.
- Change alpha daily images url to jbailey's.
- Sync debian-installer* tasks.

data/sarge/sparc/silo.conf

@@ -2,7 +2,7 @@ partition=1
 timeout=600
 message=/boot/debian.txt
 default=linux
-append="cdrom devfs=mount rw ramdisk_size=8192"
+append="cdrom devfs=mount rw"
 initrd=/boot/initrd.gz
 root=/dev/rd/0
 

debian/changelog

@@ -97,6 +97,8 @@ debian-cd (2.2.18) UNRELEASED; urgency=low
     - Add 2.6 support to powerpc cds.
     - Add yaboot to powerpc netinst cds as debootstrap no longer adds it.
     - Update boot-sparc not to depend on a kernel version.
+    - Remove ramdisk_size param of silo.conf.
+    - Add initrd-tools to sparc di+k list.
   * Bdale Garbee
     - shorten the command line in post-boot-hppa for sarge, as palo can't
       handle a command line longer than 127 chars right now

tasks/debian-installer+kernel

@@ -5,7 +5,7 @@
  * This list can be generated with the command:
  * ../tools/generate_di+k_list
  *
- * Last update: Sun Jun  6 23:08:15 MDT 2004
+ * Last update: Wed Aug  4 15:44:40 MDT 2004
  */
 
 #include <debian-installer>
@@ -20,6 +20,7 @@ aptitude
 jfbterm
 unifont
 hotplug
+usbutils
 iso-codes
 console-cyrillic
 console-terminus
@@ -28,6 +29,7 @@ wireless-tools
 xfsprogs
 jfsutils
 reiserfsprogs
+libfribidi0
 #ifdef ARCH_i386
 discover
 discover1
@@ -35,7 +37,7 @@ grub
 lilo
 kernel-image-2.4.26-1-386
 kernel-pcmcia-modules-2.4.26-1-386
-kernel-image-2.6.6-1-386
+kernel-image-2.6.7-1-386
 #endif
 #ifdef ARCH_alpha
 aboot
@@ -43,14 +45,10 @@ aboot-base
 discover1
 kernel-image-2.4-generic
 kernel-image-2.4-smp
-kernel-image-2.4.25-1-generic
-kernel-image-2.4.25-1-smp
 kernel-image-2.4.26-1-generic
 kernel-image-2.4.26-1-smp
 kernel-image-2.6-generic
 kernel-image-2.6-smp
-kernel-image-2.6.5-1-generic
-kernel-image-2.6.5-1-smp
 kernel-image-2.6.6-1-generic
 kernel-image-2.6.6-1-smp
 kernel-image-netbootable
@@ -65,10 +63,14 @@ kernel-image-netbootable
 #ifdef ARCH_ia64
 discover1
 initrd-tools
-kernel-image-2.4.25-itanium
-kernel-image-2.4.25-itanium-smp
-kernel-image-2.4.25-mckinley
-kernel-image-2.4.25-mckinley-smp
+kernel-image-2.4.26-1-itanium
+kernel-image-2.4.26-1-itanium-smp
+kernel-image-2.4.26-1-mckinley
+kernel-image-2.4.26-1-mckinley-smp
+kernel-image-2.4-itanium
+kernel-image-2.4-itanium-smp
+kernel-image-2.4-mckinley
+kernel-image-2.4-mckinley-smp
 #endif
 #ifdef ARCH_mips
 arcboot
@@ -82,7 +84,18 @@ kernel-image-2.4.26-r4k-kn04
 #endif
 #ifdef ARCH_powerpc
 discover1
+quik
 yaboot
+mkvmlinuz
+module-init-tools
+initrd-tools
+kernel-image-2.6.7-powerpc
+kernel-image-2.6.7-power3
+kernel-image-2.6.7-power4
+kernel-image-2.4.25-power3-pmac
+kernel-image-2.4.25-power3-chrp-rs6k
+kernel-image-2.4.25-power4-pmac
+kernel-image-2.4.25-power4-chrp-rs6k
 kernel-image-2.4.25-powerpc-pmac
 kernel-image-2.4.25-powerpc-small-pmac
 kernel-image-2.4.25-powerpc-prep
@@ -93,6 +106,10 @@ kernel-image-2.4.25-apus
 #ifdef ARCH_sparc
 discover1
 initrd-tools
+kernel-image-2.4-sparc32
+kernel-image-2.4-sparc32-smp
+kernel-image-2.4-sparc64
+kernel-image-2.4-sparc64-smp
 kernel-image-2.4.26-sparc32
 kernel-image-2.4.26-sparc32-smp
 kernel-image-2.4.26-sparc64
@@ -100,9 +117,9 @@ kernel-image-2.4.26-sparc64-smp
 #endif
 #ifdef ARCH_m68k
 kernel-image-2.2.25-mac
-kernel-image-2.4.26-amiga
 kernel-image-2.4.26-atari
 kernel-image-2.4.26-bvme6000
 kernel-image-2.4.26-mvme147
 kernel-image-2.4.26-mvme16x
+kernel-image-2.4.26-q40
 #endif

tools/boot/sarge/boot-alpha

@@ -26,7 +26,7 @@ N=$1
 CDDIR=$2
 BOOTDIR=
 if [ "$DI_WWW_HOME" = "default" ];then
-   DI_WWW_HOME="http://people.debian.org/~vorlon/d-i/images/daily/cdrom/"
+   DI_WWW_HOME="http://people.debian.org/~jbailey/d-i/alpha/daily/cdrom/"
 fi
 if [ ! "$DI_DIST" ]; then
    DI_DIST="$DI_CODENAME"

tools/generate_di+k_list

@@ -144,6 +144,7 @@ cat >> debian-installer+kernel << EOF
 #endif
 #ifdef ARCH_sparc
 discover1
+initrd-tools
 EOF
 
 /bin/sed -n 's/Package: \(kernel-image-.*-sparc.*\)$/\1/p' \