From 94974ba6904a7f8d75c3054b650c017e6ed32df5 Mon Sep 17 00:00:00 2001 From: Santiago Garcia Mantinan Date: Wed, 14 Apr 2004 10:44:46 +0000 Subject: [PATCH] - Update isolinux.bin to the version we are shipping with Sarge. - Update debian-installer tasks. - Update boot scripts for sarge to be able to build cds using d-i images from the chosen dist using the mirror or from the web. - Add support for sarge bootable mips cds. - Add support for sarge bootable sparc cds. --- data/sarge/isolinux.bin | Bin 8657 -> 9362 bytes data/sarge/sparc/debian.txt | 16 +++ data/sarge/sparc/silo.conf | 22 ++++ data/sarge/yaboot/boot.msg | 7 +- data/sarge/yaboot/yaboot.conf | 91 +++++++++++-- debian/changelog | 9 +- tasks/debian-installer | 218 ++++++++++++++++++++++++-------- tasks/debian-installer+kernel | 50 ++++---- tools/boot/sarge/boot-hppa | 28 ++-- tools/boot/sarge/boot-i386 | 13 +- tools/boot/sarge/boot-ia64 | 21 ++- tools/boot/sarge/boot-mips | 42 ++++++ tools/boot/sarge/boot-sparc | 32 +++-- tools/boot/sarge/post-boot-hppa | 10 +- tools/boot/sarge/post-boot-mips | 32 +++++ 15 files changed, 468 insertions(+), 123 deletions(-) create mode 100644 data/sarge/sparc/debian.txt create mode 100644 data/sarge/sparc/silo.conf create mode 100755 tools/boot/sarge/boot-mips create mode 100755 tools/boot/sarge/post-boot-mips diff --git a/data/sarge/isolinux.bin b/data/sarge/isolinux.bin index 14ed9e45111077bff82182f7194b16e55d9aabab..847bad5cf85a5a4c81357ff319b87ba5aabf729a 100644 GIT binary patch delta 5980 zcmZWNdt4J&x@W>Lfk2Ze%A+a>thhtwQ9Fo*%nGW1jmBzN=vb~YqbwntvxYTQ7}M&w-ac+B;(`FR0-BSeMr;xLYJV%j-sStOaoNFTwBUQeqG&mmyZr~Za-@f^@s({^JZZXO>8yT-s z#Ze@HycgsMJJBF-ASX{A*hX%lLgGbh6p!elCMKbB{sp>H;a^}dzc^y`!qf@nrL+KF zev>9o9$dp!Np)C?Ko{xoGCQMB@Ml7KtIZI$vM&}>q^m-XK2dkM#>wRL6_;e zZrHy-&Xft|PS{xERb;P?tO!apCV5C6u#rqu-^-GGBnNH8tZMogA}J`<@Lr0syzXntv!o0|5pX>MBDL$lK!o^4JSztJR651ky) zyh(`%>2czxv`+jBz2%wsnjgq7oL>+JoRRWj5FgFOhA@T2w7L(>@lJpav#lBXNu8bx zBViL9S=%IJjr1`AcCDepkL0vHWYb7HLt)g~DA^jR&RC8yyE|jO{p8sML0>8*o#iG! zp1Xov7-t4{rlNlzo<2CAyLELwy`Z8XUkx?I9o<6_f$rN^;n4d&~ka+ z9?~`J4OfvUZ!N8xWlp>5)$KT)vAC>v)cfBbMw9i!?>|YRNo;(g@8)R z+Yx>F)>KE9T|(S%n7sT}lvdRtqgAbFm!RjQzJq+$7D@b_HqLgPZCNa>1VQ8@-CD!z z

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 diff --git a/data/sarge/sparc/debian.txt b/data/sarge/sparc/debian.txt new file mode 100644 index 00000000..ffa03a74 --- /dev/null +++ b/data/sarge/sparc/debian.txt @@ -0,0 +1,16 @@ + + Welcome to Debian GNU/Linux ${DEBIAN_VERSION}! + +This is a Debian installation ${MEDIA_TYPE}, built on ${BUILD_DATE}. +Keep it once you have installed your system, as you can boot from it +to repair the system on your hard disk if that ever becomes necessary. + +WARNING: You should completely back up all of your hard disks before + proceeding. The installation procedure can completely and irreversibly + erase them! If you haven't made backups yet, remove the rescue CD from + the drive and press L1-A to get back to the OpenBoot prompt. + +Debian GNU/Linux comes with ABSOLUTELY NO WARRANTY, to the extent permitted +by applicable law. + +[ ENTER - Boot install ] [ Type "rescue" - Boot into rescue mode ] diff --git a/data/sarge/sparc/silo.conf b/data/sarge/sparc/silo.conf new file mode 100644 index 00000000..72fb7da2 --- /dev/null +++ b/data/sarge/sparc/silo.conf @@ -0,0 +1,22 @@ +partition=1 +timeout=600 +read-only +message=/boot/debian.txt +default=linux +append="cdrom devfs=mount" +initrd=/boot/initrd.gz +root=/dev/rd/0 + +# Standard boot images +image[sun4c,sun4d,sun4m]=/boot/sparc32 + label=linux +image[sun4u]=/boot/sparc64 + label=linux + +# Rescue boots +image[sun4c,sun4d,sun4m]=/boot/sparc32 + label=rescue + append="init=/bin/sh" +image[sun4u]=/boot/sparc64 + label=rescue + append="init=/bin/sh" diff --git a/data/sarge/yaboot/boot.msg b/data/sarge/yaboot/boot.msg index 63ac1113..b55650f1 100644 --- a/data/sarge/yaboot/boot.msg +++ b/data/sarge/yaboot/boot.msg @@ -8,9 +8,14 @@ there is 'install-safe' which you should try if the system fails to boot at all (the typical symptom is a white screen which doesn't go away). -For maximum control, you can use the'expert' +For maximum control, you can use the 'expert' and 'expert-safe' options. +The plain options are for the powerpc family of +processors (from 601 to G4). The -power3 options +are for IBM Power3 boxes, and the -power4 options +are for IBM Power4 and Apple G5 boxes. + ************************************ If in doubt, just choose 'install', and if that doesn't work, try 'install-safe'. diff --git a/data/sarge/yaboot/yaboot.conf b/data/sarge/yaboot/yaboot.conf index 05024f09..e3b970bd 100644 --- a/data/sarge/yaboot/yaboot.conf +++ b/data/sarge/yaboot/yaboot.conf @@ -7,33 +7,98 @@ default=install timeout=100 # FIXME: will this be the correct path? -message=/install/powermac/boot.msg +message=/install/boot.msg -image=/install/powermac/vmlinux - label=install - initrd=/install/powermac/root.bin +# Powerpc subarch +image=/install/powerpc/vmlinux + label=install-powerpc + alias=install + initrd=/install/powerpc/initrd.gz append="devfs=mount,dall init=/linuxrc" initrd-size=8192 read-only -image=/install/powermac/vmlinux - label=expert - initrd=/install/powermac/root.bin +image=/install/powerpc/vmlinux + label=expert-powerpc + alias=expert + initrd=/install/powerpc/initrd.gz append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc" initrd-size=8192 read-only # some machines have wonky framebuffer support -image=/install/powermac/vmlinux - label=install-safe - initrd=/install/powermac/root.bin +image=/install/powerpc/vmlinux + label=install-safe-powerpc + alias=install-safe + initrd=/install/powerpc/initrd.gz initrd-size=8192 append="devfs=mount,dall video=ofonly init=/linuxrc" read-only -image=/install/powermac/vmlinux - label=expert-safe - initrd=/install/powermac/root.bin +image=/install/powerpc/vmlinux + label=expert-safe-powerpc + alias=expert-safe + initrd=/install/powerpc/initrd.gz + initrd-size=8192 + append="DEBCONF_PRIORITY=low devfs=mount,dall video=ofonly init=/linuxrc" + read-only + +# Power3 subarch +image=/install/power3/vmlinux + label=install-power3 + initrd=/install/power3/initrd.gz + append="devfs=mount,dall init=/linuxrc" + initrd-size=8192 + read-only + +image=/install/power3/vmlinux + label=expert-power3 + initrd=/install/power3/initrd.gz + append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc" + initrd-size=8192 + read-only + +# some machines have wonky framebuffer support +image=/install/power3/vmlinux + label=install-safe-power3 + initrd=/install/power3/initrd.gz + initrd-size=8192 + append="devfs=mount,dall video=ofonly init=/linuxrc" + read-only + +image=/install/power3/vmlinux + label=expert-safe-power3 + initrd=/install/power3/initrd.gz + initrd-size=8192 + append="DEBCONF_PRIORITY=low devfs=mount,dall video=ofonly init=/linuxrc" + read-only + +# Power 4 subarch +image=/install/power4/vmlinux + label=install-power4 + initrd=/install/power4/initrd.gz + append="devfs=mount,dall init=/linuxrc" + initrd-size=8192 + read-only + +image=/install/power4/vmlinux + label=expert-power4 + initrd=/install/power4/initrd.gz + append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc" + initrd-size=8192 + read-only + +# some machines have wonky framebuffer support +image=/install/power4/vmlinux + label=install-safe-power4 + initrd=/install/power4/initrd.gz + initrd-size=8192 + append="devfs=mount,dall video=ofonly init=/linuxrc" + read-only + +image=/install/power4/vmlinux + label=expert-safe-power4 + initrd=/install/power4/initrd.gz initrd-size=8192 append="DEBCONF_PRIORITY=low devfs=mount,dall video=ofonly init=/linuxrc" read-only diff --git a/debian/changelog b/debian/changelog index bdc3ed23..1c0e19ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,7 +38,14 @@ debian-cd (2.2.18) UNRELEASED; urgency=low kernel-pcmcia-modules-2.4.22-xfs-686-smp, kernel-source-2.2.20, timidity-patches, tcl8.2 and tk8.2. * Stephen R. Marenka - - m68k support. + - m68k support. + * Santiago Garcia + - Update isolinux.bin to the version we are shipping with Sarge. + - Update debian-installer tasks. + - Update boot scripts for sarge to be able to build cds using d-i + images from the chosen dist using the mirror or from the web. + - Add support for sarge bootable mips cds. + - Add support for sarge bootable sparc cds. -- Raphael Hertzog Thu, 25 Mar 2004 07:33:23 +0100 diff --git a/tasks/debian-installer b/tasks/debian-installer index 2fa0691e..18d19b05 100644 --- a/tasks/debian-installer +++ b/tasks/debian-installer @@ -3,7 +3,7 @@ * This list can be generated with the command: * ../tools/generate_di_list * - * Last update: Mon Mar 15 14:13:15 MST 2004 + * Last update: Tue Apr 13 14:22:09 MDT 2004 */ #ifdef ARCH_alpha aboot-installer @@ -11,14 +11,14 @@ archdetect autopartkit base-installer baseconfig-udeb -brltty-modules-2.4.24-1-generic-di +brltty-modules-2.4.25-1-generic-di brltty-udeb bterm-unifont bugreporter-udeb cdebconf-text-udeb cdebootstrap-udeb -cdrom-core-modules-2.4.24-1-generic-di -cdrom-modules-2.4.24-1-generic-di +cdrom-core-modules-2.4.25-1-generic-di +cdrom-modules-2.4.25-1-generic-di choose-mirror console-keymaps-acorn console-keymaps-amiga @@ -34,22 +34,25 @@ di-utils di-utils-mapdevfs discover-data-udeb discover-udeb +discover1-data-udeb +discover1-udeb discover2-data-udeb discover2-udeb e2fsprogs-udeb ethdetect evms-udeb -ext3-modules-2.4.24-1-generic-di -fb-modules-2.4.24-1-generic-di +ext3-modules-2.4.25-1-generic-di +fat-modules-2.4.25-1-generic-di +fb-modules-2.4.25-1-generic-di fbset-udeb fdisk-udeb hw-detect-full -ide-core-modules-2.4.24-1-generic-di -ide-modules-2.4.24-1-generic-di -ipv6-modules-2.4.24-1-generic-di -isa-pnp-modules-2.4.24-1-generic-di +ide-core-modules-2.4.25-1-generic-di +ide-modules-2.4.25-1-generic-di +ipv6-modules-2.4.25-1-generic-di +isa-pnp-modules-2.4.25-1-generic-di iso-3166-udeb -jfs-modules-2.4.24-1-generic-di +jfs-modules-2.4.25-1-generic-di jfsutils-udeb kbd-chooser libblkid1-udeb @@ -58,6 +61,7 @@ libdebian-installer-extra4-udeb libdebian-installer4-udeb libdevmapper1.00-udeb libdirectfb-0.9-20-udeb +libfribidi0-udeb libiw27-udeb libparted1.6-udeb libreiserfs0.3-udeb @@ -67,15 +71,16 @@ lvm10-udeb lvm2-udeb lvmcfg lvmcfg-utils -md-modules-2.4.24-1-generic-di +md-modules-2.4.25-1-generic-di mkreiserfs-udeb net-retriever netcfg -nic-extra-modules-2.4.24-1-generic-di -nic-modules-2.4.24-1-generic-di -nic-shared-modules-2.4.24-1-generic-di +nic-extra-modules-2.4.25-1-generic-di +nic-modules-2.4.25-1-generic-di +nic-shared-modules-2.4.25-1-generic-di nobootloader -parport-modules-2.4.24-1-generic-di +os-prober +parport-modules-2.4.25-1-generic-di partconf partconf-find-partitions partconf-mkfstab @@ -92,24 +97,25 @@ partman-reiserfs partman-target partman-xfs pcmcia-cs-udeb -plip-modules-2.4.24-1-generic-di -ppp-modules-2.4.24-1-generic-di +plip-modules-2.4.25-1-generic-di +ppp-modules-2.4.25-1-generic-di ppp-udeb prebaseconfig raidtools2-udeb -reiserfs-modules-2.4.24-1-generic-di -scsi-common-modules-2.4.24-1-generic-di -scsi-core-modules-2.4.24-1-generic-di -scsi-extra-modules-2.4.24-1-generic-di -scsi-modules-2.4.24-1-generic-di -serial-modules-2.4.24-1-generic-di -socket-modules-2.4.24-1-generic-di -srm-modules-2.4.24-1-generic-di +reiserfs-modules-2.4.25-1-generic-di +scsi-common-modules-2.4.25-1-generic-di +scsi-core-modules-2.4.25-1-generic-di +scsi-extra-modules-2.4.25-1-generic-di +scsi-modules-2.4.25-1-generic-di +serial-modules-2.4.25-1-generic-di +socket-modules-2.4.25-1-generic-di +srm-modules-2.4.25-1-generic-di srm-reader -usb-modules-2.4.24-1-generic-di -usb-storage-modules-2.4.24-1-generic-di +usb-modules-2.4.25-1-generic-di +usb-storage-modules-2.4.25-1-generic-di userdevfs wireless-tools-udeb +xfs-modules-2.4.25-1-generic-di xfsprogs-udeb #endif /* ARCH_alpha */ #ifdef ARCH_arm @@ -122,6 +128,8 @@ bterm-unifont bugreporter-udeb cdebconf-text-udeb cdebootstrap-udeb +cdrom-core-modules-2.4.25-bast-di +cdrom-core-modules-2.4.25-netwinder-di choose-mirror console-keymaps-acorn console-keymaps-amiga @@ -137,14 +145,23 @@ di-utils di-utils-mapdevfs discover-data-udeb discover-udeb +discover1-data-udeb +discover1-udeb discover2-data-udeb discover2-udeb e2fsprogs-udeb ethdetect evms-udeb +ext3-modules-2.4.25-netwinder-di +ext3-modules-2.4.25-riscpc-di +ext3-modules-2.4.25-riscstation-di +fat-modules-2.4.25-netwinder-di +fat-modules-2.4.25-riscpc-di +fat-modules-2.4.25-riscstation-di fbset-udeb fdisk-udeb hw-detect-full +isa-pnp-modules-2.4.25-netwinder-di iso-3166-udeb jfsutils-udeb kbd-chooser @@ -154,10 +171,14 @@ libdebian-installer-extra4-udeb libdebian-installer4-udeb libdevmapper1.00-udeb libdirectfb-0.9-20-udeb +libfribidi0-udeb libiw27-udeb libparted1.6-udeb libreiserfs0.3-udeb libuuid1-udeb +loop-modules-2.4.25-bast-di +loop-modules-2.4.25-netwinder-di +loop-modules-2.4.25-riscpc-di lowmem lvm10-udeb lvm2-udeb @@ -166,7 +187,11 @@ lvmcfg-utils mkreiserfs-udeb net-retriever netcfg +nic-extra-modules-2.4.25-netwinder-di +nic-modules-2.4.25-netwinder-di +nic-shared-modules-2.4.25-netwinder-di nobootloader +os-prober partconf partconf-find-partitions partconf-mkfstab @@ -186,6 +211,16 @@ pcmcia-cs-udeb ppp-udeb prebaseconfig raidtools2-udeb +scsi-common-modules-2.4.25-netwinder-di +scsi-core-modules-2.4.25-netwinder-di +scsi-extra-modules-2.4.25-netwinder-di +scsi-modules-2.4.25-netwinder-di +socket-modules-2.4.25-bast-di +socket-modules-2.4.25-lart-di +socket-modules-2.4.25-netwinder-di +socket-modules-2.4.25-riscpc-di +socket-modules-2.4.25-riscstation-di +usb-modules-2.4.25-netwinder-di userdevfs wireless-tools-udeb xfsprogs-udeb @@ -215,6 +250,8 @@ di-utils di-utils-mapdevfs discover-data-udeb discover-udeb +discover1-data-udeb +discover1-udeb discover2-data-udeb discover2-udeb e2fsprogs-udeb @@ -223,6 +260,8 @@ evms-udeb fbset-udeb fdisk-udeb hw-detect-full +ipv6-modules-2.4.25-32-di +ipv6-modules-2.4.25-64-di iso-3166-udeb jfsutils-udeb kbd-chooser @@ -232,6 +271,7 @@ libdebian-installer-extra4-udeb libdebian-installer4-udeb libdevmapper1.00-udeb libdirectfb-0.9-20-udeb +libfribidi0-udeb libiw27-udeb libparted1.6-udeb libreiserfs0.3-udeb @@ -244,7 +284,10 @@ lvmcfg-utils mkreiserfs-udeb net-retriever netcfg +nic-modules-2.4.25-32-di +nic-modules-2.4.25-64-di nobootloader +os-prober palo-installer partconf partconf-find-partitions @@ -262,6 +305,9 @@ partman-partitioning partman-reiserfs partman-target partman-xfs +pcmcia-cs-udeb +ppp-modules-2.4.25-32-di +ppp-modules-2.4.25-64-di ppp-udeb prebaseconfig raidtools2-udeb @@ -283,6 +329,7 @@ console-keymaps-sun console-keymaps-usb di-utils discover-data-udeb +discover1-data-udeb discover2-data-udeb e2fsprogs-udeb ethdetect @@ -292,6 +339,7 @@ iso-3166-udeb libblkid1-udeb libc-udeb libparted1.6-udeb +libreiserfs0.3-udeb libuuid1-udeb lowmem lvmcfg @@ -333,6 +381,8 @@ debootstrap-udeb dhcp-client-udeb di-utils di-utils-mapdevfs +discover1-data-udeb +discover1-udeb discover2-data-udeb discover2-udeb e2fsprogs-udeb @@ -354,6 +404,7 @@ libdebian-installer-extra4-udeb libdebian-installer4-udeb libdevmapper1.00-udeb libdirectfb-0.9-20-udeb +libfribidi0-udeb libiw27-udeb libparted1.6-udeb libreiserfs0.3-udeb @@ -374,6 +425,8 @@ nic-modules-2.4.25-1-386-di nic-pcmcia-modules-2.4.25-1-386-di nic-shared-modules-2.4.25-1-386-di nobootloader +ntfs-modules-2.4.25-1-386-di +os-prober parport-modules-2.4.25-1-386-di partconf-find-partitions parted-udeb @@ -389,6 +442,7 @@ partman-target partman-xfs pcmcia-cs-udeb pcmcia-modules-2.4.25-1-386-di +pcmcia-storage-modules-2.4.25-1-386-di plip-modules-2.4.25-1-386-di ppp-modules-2.4.25-1-386-di ppp-udeb @@ -408,13 +462,13 @@ archdetect autopartkit base-installer baseconfig-udeb -brltty-modules-2.4.25-itanium-di +brltty-modules-2.4.25-itanium-smp-di brltty-udeb bterm-unifont bugreporter-udeb cdebconf-text-udeb cdebootstrap-udeb -cdrom-core-modules-2.4.25-itanium-di +cdrom-core-modules-2.4.25-itanium-smp-di choose-mirror console-keymaps-acorn console-keymaps-amiga @@ -430,6 +484,8 @@ di-utils di-utils-mapdevfs discover-data-udeb discover-udeb +discover1-data-udeb +discover1-udeb discover2-data-udeb discover2-udeb e2fsprogs-udeb @@ -437,17 +493,17 @@ efi-reader elilo-installer ethdetect evms-udeb -ext3-modules-2.4.25-itanium-di -fat-modules-2.4.25-itanium-di -fb-modules-2.4.25-itanium-di +ext3-modules-2.4.25-itanium-smp-di +fat-modules-2.4.25-itanium-smp-di +fb-modules-2.4.25-itanium-smp-di fbset-udeb fdisk-udeb -firewire-core-modules-2.4.25-itanium-di +firewire-core-modules-2.4.25-itanium-smp-di hw-detect-full -ide-core-modules-2.4.25-itanium-di -ide-modules-2.4.25-itanium-di -input-modules-2.4.25-itanium-di -ipv6-modules-2.4.25-itanium-di +ide-core-modules-2.4.25-itanium-smp-di +ide-modules-2.4.25-itanium-smp-di +input-modules-2.4.25-itanium-smp-di +ipv6-modules-2.4.25-itanium-smp-di iso-3166-udeb jfsutils-udeb kbd-chooser @@ -457,23 +513,25 @@ libdebian-installer-extra4-udeb libdebian-installer4-udeb libdevmapper1.00-udeb libdirectfb-0.9-20-udeb +libfribidi0-udeb libiw27-udeb libparted1.6-udeb libreiserfs0.3-udeb libuuid1-udeb -loop-modules-2.4.25-itanium-di +loop-modules-2.4.25-itanium-smp-di lowmem lvm10-udeb lvm2-udeb lvmcfg lvmcfg-utils -md-modules-2.4.25-itanium-di +md-modules-2.4.25-itanium-smp-di mkreiserfs-udeb net-retriever netcfg -nic-modules-2.4.25-itanium-di +nic-modules-2.4.25-itanium-smp-di nobootloader -parport-modules-2.4.25-itanium-di +os-prober +parport-modules-2.4.25-itanium-smp-di partconf partconf-find-partitions partconf-mkfstab @@ -490,19 +548,19 @@ partman-reiserfs partman-target partman-xfs pcmcia-cs-udeb -plip-modules-2.4.25-itanium-di -ppp-modules-2.4.25-itanium-di +plip-modules-2.4.25-itanium-smp-di +ppp-modules-2.4.25-itanium-smp-di ppp-udeb prebaseconfig raidtools2-udeb -reiserfs-modules-2.4.25-itanium-di -scsi-modules-2.4.25-itanium-di -serial-modules-2.4.25-itanium-di -usb-modules-2.4.25-itanium-di -usb-storage-modules-2.4.25-itanium-di +reiserfs-modules-2.4.25-itanium-smp-di +scsi-modules-2.4.25-itanium-smp-di +serial-modules-2.4.25-itanium-smp-di +usb-modules-2.4.25-itanium-smp-di +usb-storage-modules-2.4.25-itanium-smp-di userdevfs wireless-tools-udeb -xfs-modules-2.4.25-itanium-di +xfs-modules-2.4.25-itanium-smp-di xfsprogs-udeb #endif /* ARCH_ia64 */ #ifdef ARCH_m68k @@ -543,6 +601,10 @@ fat-modules-2.4.25-amiga-di fbset-udeb hw-detect-full ipv6-modules-2.2.25-mac-di +<<<<<<< debian-installer +ipv6-modules-2.4.25-amiga-di +======= +>>>>>>> 1.13 iso-3166-udeb jfs-modules-2.4.25-amiga-di jfsutils-udeb @@ -553,6 +615,7 @@ libdebian-installer-extra4-udeb libdebian-installer4-udeb libdevmapper1.00-udeb libdirectfb-0.9-20-udeb +libfribidi0-udeb libiw27-udeb libparted1.6-udeb libreiserfs0.3-udeb @@ -569,6 +632,7 @@ netcfg nic-shared-modules-2.2.25-mac-di nic-shared-modules-2.4.25-amiga-di nobootloader +os-prober partconf partconf-find-partitions partconf-mkfstab @@ -607,6 +671,7 @@ bterm-unifont bugreporter-udeb cdebconf-text-udeb cdebootstrap-udeb +cdrom-core-modules-2.4.22-sb1-swarm-bn-di choose-mirror console-keymaps-acorn console-keymaps-amiga @@ -622,19 +687,25 @@ di-utils di-utils-mapdevfs discover-data-udeb discover-udeb +discover1-data-udeb +discover1-udeb discover2-data-udeb discover2-udeb e2fsprogs-udeb ethdetect evms-udeb +fat-modules-2.4.22-sb1-swarm-bn-di fbset-udeb fdisk-udeb +hfs-modules-2.4.22-sb1-swarm-bn-di hw-detect-full ipv6-modules-2.4.22-r4k-ip22-di ipv6-modules-2.4.22-r5k-ip22-di +ipv6-modules-2.4.22-sb1-swarm-bn-di iso-3166-udeb jfs-modules-2.4.22-r4k-ip22-di jfs-modules-2.4.22-r5k-ip22-di +jfs-modules-2.4.22-sb1-swarm-bn-di jfsutils-udeb kbd-chooser libblkid1-udeb @@ -643,10 +714,12 @@ libdebian-installer-extra4-udeb libdebian-installer4-udeb libdevmapper1.00-udeb libdirectfb-0.9-20-udeb +libfribidi0-udeb libiw27-udeb libparted1.6-udeb libreiserfs0.3-udeb libuuid1-udeb +loop-modules-2.4.22-sb1-swarm-bn-di lowmem lvm10-udeb lvm2-udeb @@ -654,10 +727,12 @@ lvmcfg lvmcfg-utils md-modules-2.4.22-r4k-ip22-di md-modules-2.4.22-r5k-ip22-di +md-modules-2.4.22-sb1-swarm-bn-di mkreiserfs-udeb net-retriever netcfg nobootloader +os-prober partconf partconf-find-partitions partconf-mkfstab @@ -673,15 +748,20 @@ partman-partitioning partman-reiserfs partman-target partman-xfs +pcmcia-cs-udeb ppp-modules-2.4.19-r4k-ip22-udeb ppp-modules-2.4.22-r4k-ip22-di -ppp-modules-2.4.22-r4k-ip22-udeb ppp-modules-2.4.22-r5k-ip22-di +ppp-modules-2.4.22-sb1-swarm-bn-di ppp-udeb prebaseconfig raidtools2-udeb reiserfs-modules-2.4.22-r4k-ip22-di reiserfs-modules-2.4.22-r5k-ip22-di +reiserfs-modules-2.4.22-sb1-swarm-bn-di +scsi-core-modules-2.4.22-sb1-swarm-bn-di +socket-modules-2.4.22-sb1-swarm-bn-di +usb-storage-modules-2.4.22-sb1-swarm-bn-di userdevfs wireless-tools-udeb xfsprogs-udeb @@ -712,6 +792,8 @@ di-utils di-utils-mapdevfs discover-data-udeb discover-udeb +discover1-data-udeb +discover1-udeb discover2-data-udeb discover2-udeb e2fsprogs-udeb @@ -731,6 +813,7 @@ libdebian-installer-extra4-udeb libdebian-installer4-udeb libdevmapper1.00-udeb libdirectfb-0.9-20-udeb +libfribidi0-udeb libiw27-udeb libparted1.6-udeb libreiserfs0.3-udeb @@ -746,6 +829,7 @@ mkreiserfs-udeb net-retriever netcfg nobootloader +os-prober partconf partconf-find-partitions partconf-mkfstab @@ -761,6 +845,7 @@ partman-partitioning partman-reiserfs partman-target partman-xfs +pcmcia-cs-udeb ppp-modules-2.4.19-r3k-kn02-di ppp-modules-2.4.19-r3k-kn02-udeb ppp-modules-2.4.19-r4k-kn04-di @@ -805,6 +890,8 @@ di-utils di-utils-mapdevfs discover-data-udeb discover-udeb +discover1-data-udeb +discover1-udeb discover2-data-udeb discover2-udeb e2fsprogs-udeb @@ -823,18 +910,18 @@ hfs-modules-2.4.25-power4-di hfs-modules-2.4.25-powerpc-di hfs-modules-2.4.25-powerpc-small-di hw-detect-full +ide-modules-2.4.25-apus-di ide-modules-2.4.25-power3-di ide-modules-2.4.25-power4-di ide-modules-2.4.25-powerpc-di ide-modules-2.4.25-powerpc-small-di +input-modules-2.4.25-apus-di input-modules-2.4.25-powerpc-small-di ipv6-modules-2.4.25-powerpc-small-di irda-modules-2.4.25-powerpc-small-di isa-pnp-modules-2.4.25-powerpc-small-di iso-3166-udeb -jfs-modules-2.4.25-power3-di -jfs-modules-2.4.25-power4-di -jfs-modules-2.4.25-powerpc-di +jfs-modules-2.4.25-apus-di jfs-modules-2.4.25-powerpc-small-di jfsutils-udeb kbd-chooser @@ -844,6 +931,7 @@ libdebian-installer-extra4-udeb libdebian-installer4-udeb libdevmapper1.00-udeb libdirectfb-0.9-20-udeb +libfribidi0-udeb libiw27-udeb libparted1.6-udeb libreiserfs0.3-udeb @@ -855,6 +943,7 @@ lvm2-udeb lvmcfg lvmcfg-utils mac-fdisk-udeb +md-modules-2.4.25-apus-di md-modules-2.4.25-powerpc-small-di mkreiserfs-udeb net-retriever @@ -863,6 +952,7 @@ nic-extra-modules-2.4.25-power3-di nic-extra-modules-2.4.25-power4-di nic-extra-modules-2.4.25-powerpc-di nic-extra-modules-2.4.25-powerpc-small-di +nic-modules-2.4.25-apus-di nic-modules-2.4.25-power3-di nic-modules-2.4.25-power4-di nic-modules-2.4.25-powerpc-di @@ -873,6 +963,8 @@ nic-shared-modules-2.4.25-power4-di nic-shared-modules-2.4.25-powerpc-di nic-shared-modules-2.4.25-powerpc-small-di nobootloader +os-prober +parport-modules-2.4.25-apus-di parport-modules-2.4.25-powerpc-small-di partconf partconf-find-partitions @@ -885,12 +977,14 @@ partman-basicfilesystems partman-basicmethods partman-ext3 partman-lvm +partman-newworld partman-partitioning partman-reiserfs partman-target partman-xfs pcmcia-cs-udeb pcmcia-modules-2.4.25-powerpc-small-di +plip-modules-2.4.25-apus-di plip-modules-2.4.25-power3-di plip-modules-2.4.25-power4-di plip-modules-2.4.25-powerpc-di @@ -910,6 +1004,7 @@ scsi-common-modules-2.4.25-powerpc-di scsi-common-modules-2.4.25-powerpc-small-di scsi-core-modules-2.4.25-powerpc-small-di scsi-extra-modules-2.4.25-powerpc-small-di +scsi-modules-2.4.25-apus-di scsi-modules-2.4.25-power3-di scsi-modules-2.4.25-power4-di scsi-modules-2.4.25-powerpc-di @@ -927,6 +1022,7 @@ usb-modules-2.4.25-powerpc-small-di usb-storage-modules-2.4.25-powerpc-small-di userdevfs wireless-tools-udeb +xfs-modules-2.4.25-powerpc-small-di xfsprogs-udeb yaboot-installer #endif /* ARCH_powerpc */ @@ -955,6 +1051,8 @@ di-utils di-utils-mapdevfs discover-data-udeb discover-udeb +discover1-data-udeb +discover1-udeb discover2-data-udeb discover2-udeb e2fsprogs-udeb @@ -973,6 +1071,7 @@ libdebian-installer-extra4-udeb libdebian-installer4-udeb libdevmapper1.00-udeb libdirectfb-0.9-20-udeb +libfribidi0-udeb libiw27-udeb libparted1.6-udeb libreiserfs0.3-udeb @@ -986,7 +1085,9 @@ mkreiserfs-udeb net-retriever nic-modules-2.4.19-s390-udeb nic-modules-2.4.21-1-s390-di +nic-modules-2.4.25-1-s390-di nobootloader +os-prober partconf partconf-find-partitions partconf-mkfstab @@ -1009,7 +1110,9 @@ s390-dasd s390-netdevice s390-tools-udeb scsi-core-modules-2.4.21-1-s390-di +scsi-core-modules-2.4.25-1-s390-di scsi-modules-2.4.21-1-s390-di +scsi-modules-2.4.25-1-s390-di userdevfs wireless-tools-udeb xfsprogs-udeb @@ -1024,6 +1127,7 @@ bterm-unifont bugreporter-udeb cdebconf-text-udeb cdebootstrap-udeb +cdrom-core-modules-2.4.24-sparc32-di cdrom-core-modules-2.4.24-sparc64-di choose-mirror console-keymaps-acorn @@ -1040,6 +1144,8 @@ di-utils di-utils-mapdevfs discover-data-udeb discover-udeb +discover1-data-udeb +discover1-udeb discover2-data-udeb discover2-udeb e2fsprogs-udeb @@ -1058,6 +1164,7 @@ libdebian-installer-extra4-udeb libdebian-installer4-udeb libdevmapper1.00-udeb libdirectfb-0.9-20-udeb +libfribidi0-udeb libiw27-udeb libparted1.6-udeb libreiserfs0.3-udeb @@ -1071,6 +1178,7 @@ mkreiserfs-udeb net-retriever netcfg nobootloader +os-prober partconf partconf-find-partitions partconf-mkfstab @@ -1086,6 +1194,7 @@ partman-partitioning partman-reiserfs partman-target partman-xfs +pcmcia-cs-udeb ppp-modules-2.4.24-sparc32-di ppp-modules-2.4.24-sparc64-di ppp-udeb @@ -1109,6 +1218,7 @@ console-keymaps-sun console-keymaps-usb di-utils discover-data-udeb +discover1-data-udeb discover2-data-udeb ethdetect hw-detect-full diff --git a/tasks/debian-installer+kernel b/tasks/debian-installer+kernel index 8b4e999e..b53ca8ff 100644 --- a/tasks/debian-installer+kernel +++ b/tasks/debian-installer+kernel @@ -5,14 +5,11 @@ * This list can be generated with the command: * ../tools/generate_di+k_list * - * Last update: Tue Mar 16 02:27:52 MST 2004 + * Last update: Tue Apr 13 14:22:10 MDT 2004 */ #include -discover eject -grub -lilo locales lvm10 aptitude @@ -27,14 +24,16 @@ wireless-tools xfsprogs reiserfsprogs #ifdef ARCH_i386 +discover +grub +lilo kernel-image-2.4.25-1-386 kernel-pcmcia-modules-2.4.25-1-386 #endif #ifdef ARCH_alpha +discover kernel-image-2.4-generic kernel-image-2.4-smp -kernel-image-2.4.24-1-generic -kernel-image-2.4.24-1-smp kernel-image-2.4.25-1-generic kernel-image-2.4.25-1-smp kernel-image-2.6-generic @@ -43,33 +42,40 @@ kernel-image-2.6.3-1-generic kernel-image-2.6.3-1-smp #endif #ifdef ARCH_hppa -kernel-image-2.4.21-32 -kernel-image-2.4.21-32-smp -kernel-image-2.4.21-64 -kernel-image-2.4.21-64-smp +discover +kernel-image-2.4.25-32 +kernel-image-2.4.25-32-smp +kernel-image-2.4.25-64 +kernel-image-2.4.25-64-smp #endif #ifdef ARCH_ia64 +discover initrd-tools kernel-image-2.6.3-itanium kernel-image-2.6.3-itanium-smp kernel-image-2.6.3-mckinley kernel-image-2.6.3-mckinley-smp #endif +#ifdef ARCH_mips +arcboot +kernel-image-2.4.22-r4k-ip22 +kernel-image-2.4.22-r5k-ip22 +#endif +#ifdef ARCH_mipsel +kernel-image-2.4.19-r3k-kn02 +kernel-image-2.4.19-r4k-kn04 +#endif #ifdef ARCH_powerpc -kernel-image-2.4.22-powerpc-chrp -kernel-image-2.4.22-powerpc-chrp-rs6k -kernel-image-2.4.22-powerpc-pmac -kernel-image-2.4.22-powerpc-prep -kernel-image-2.4.22-powerpc-small-chrp -kernel-image-2.4.22-powerpc-small-chrp-rs6k -kernel-image-2.4.22-powerpc-small-pmac -kernel-image-2.4.22-powerpc-small-prep -kernel-image-2.4.22-powerpc-smp-chrp -kernel-image-2.4.22-powerpc-smp-chrp-rs6k -kernel-image-2.4.22-powerpc-smp-pmac -kernel-image-2.4.22-powerpc-smp-prep +discover +kernel-image-2.4.25-powerpc-pmac +kernel-image-2.4.25-powerpc-small-pmac +kernel-image-2.4.25-powerpc-prep +kernel-image-2.4.25-powerpc-chrp +kernel-image-2.4.25-powerpc-chrp-rs6k +kernel-image-2.4.25-apus #endif #ifdef ARCH_sparc +discover kernel-image-2.4.24-sparc32 kernel-image-2.4.24-sparc32-smp kernel-image-2.4.24-sparc64 diff --git a/tools/boot/sarge/boot-hppa b/tools/boot/sarge/boot-hppa index 6e2fe3ed..9932fbec 100755 --- a/tools/boot/sarge/boot-hppa +++ b/tools/boot/sarge/boot-hppa @@ -14,7 +14,10 @@ set -e N=$1 CDROOT=$2 if [ "$DI_WWW_HOME" = "default" ];then - DI_WWW_HOME="http://people.debian.org/~tsauter/d-i/images-hppa/daily" + DI_WWW_HOME="http://people.debian.org/~jbailey/d-i/hppa/daily/cdrom" +fi +if [ ! "$DI_DIST" ]; then + DI_DIST="$DI_CODENAME" fi :> $1.mkisofs_opts @@ -24,17 +27,22 @@ if [ $N != 1 -a $N != 1_NONUS ]; then exit 0 fi +PALODEB="$($BASEDIR/tools/apt-selection cache show palo | \ + sed -n 's/^Filename: \(.*_hppa.deb\)$/\1/p')" +ar p "${MIRROR}/${PALODEB}" data.tar.gz | tar xz ./usr/share/palo/iplboot +mv usr/share/palo/iplboot $CDROOT/install/iplboot + if [ ! "$DI_WWW_HOME" ];then - cp $MIRROR/dists/sid/main/installer-$ARCH/current/images/cdrom/iplboot $CDROOT/install/iplboot - cp $MIRROR/dists/sid/main/installer-$ARCH/current/images/cdrom/vmlinux-2.4.20-32-udeb $CDROOT/install/vmlinux-32 - cp $MIRROR/dists/sid/main/installer-$ARCH/current/images/cdrom/vmlinux-2.4.20-64-udeb $CDROOT/install/vmlinux-64 - cp $MIRROR/dists/sid/main/installer-$ARCH/current/images/cdrom/cdrom-initrd.gz $CDROOT/install/root.bin + DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom" else - wget "$DI_WWW_HOME/iplboot" -O $CDROOT/install/iplboot - wget "$DI_WWW_HOME/vmlinux-2.4.20-32-udeb" -O $CDROOT/install/vmlinux-32 - wget "$DI_WWW_HOME/vmlinux-2.4.20-64-udeb" -O $CDROOT/install/vmlinux-64 - wget "$DI_WWW_HOME/cdrom-initrd.gz" -O $CDROOT/install/root.bin + DI_DIR="di_stuff" + mkdir "$DI_DIR" + wget -r -nd --no-parent -P "$DI_DIR" "$DI_WWW_HOME" fi -install_languages $CDROOT +cp "$DI_DIR"/vmlinux-*-32 "$CDROOT/install" +cp "$DI_DIR"/vmlinux-*-64 "$CDROOT/install" +cp "$DI_DIR"/initrd.gz "$CDROOT/install" + +install_languages "$CDROOT" exit 0 diff --git a/tools/boot/sarge/boot-i386 b/tools/boot/sarge/boot-i386 index 98e904cd..7f217214 100755 --- a/tools/boot/sarge/boot-i386 +++ b/tools/boot/sarge/boot-i386 @@ -13,8 +13,11 @@ set -e N=$1 CDDIR=$2 BOOTDIR= -if [ ! "$WWW_HOME" ];then - WWW_HOME="http://people.debian.org/~joeyh/d-i/images/daily" +if [ "$DI_WWW_HOME" = "default" ];then + DI_WWW_HOME="http://people.debian.org/~joeyh/d-i/images/daily" +fi +if [ ! "$DI_DIST" ]; then + DI_DIST="$DI_CODENAME" fi cd $CDDIR/.. @@ -52,7 +55,11 @@ for image in $BOOT_IMAGES $DISK_IMAGES; do if [ ! -e "$image" ]; then dir=$(dirname $image) mkdir -p $dir - wget $WWW_HOME/$image -O $image + if [ ! "$DI_WWW_HOME" ];then + cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/$image" "$image" + else + wget "$DI_WWW_HOME/$image" -O "$image" + fi fi done diff --git a/tools/boot/sarge/boot-ia64 b/tools/boot/sarge/boot-ia64 index 9cab5db3..d04342c7 100755 --- a/tools/boot/sarge/boot-ia64 +++ b/tools/boot/sarge/boot-ia64 @@ -13,8 +13,11 @@ set -x N=$1 CDDIR=$2 BOOTDIR= -if [ ! "$WWW_HOME" ];then - WWW_HOME="http://people.debian.org/~jbailey/ia64" +if [ "$DI_WWW_HOME" = "default" ];then + DI_WWW_HOME="http://people.debian.org/~jbailey/d-i/ia64/daily" +fi +if [ ! "$DI_DIST" ]; then + DI_DIST="$DI_CODENAME" fi cd $CDDIR/.. @@ -26,17 +29,21 @@ if [ $N != 1 -a $N != 1_NONUS ]; then fi # Download boot images -for image in cdrom-image.img; do +for image in boot.img; do if [ ! -e "$image" ]; then - wget $WWW_HOME/$image + if [ ! "$DI_WWW_HOME" ];then + cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/$image" . + else + wget "$DI_WWW_HOME/$image" + fi fi done -#install_languages $CDDIR +install_languages $CDDIR mkdir -p boot$N/boot -cp -f cdrom-image.img boot$N/boot/ -echo -n "-no-emul-boot -J -b boot/cdrom-image.img -c boot/boot.catalog boot$N" > $N.mkisofs_opts +cp -f boot.img boot$N/boot/ +echo -n "-no-emul-boot -J -b boot/boot.img -c boot/boot.catalog boot$N" > $N.mkisofs_opts # done diff --git a/tools/boot/sarge/boot-mips b/tools/boot/sarge/boot-mips new file mode 100755 index 00000000..acfd40ae --- /dev/null +++ b/tools/boot/sarge/boot-mips @@ -0,0 +1,42 @@ +#!/bin/bash +# +# boot-mips +# +# $1 is the CD number +# $2 is the temporary CD build dir + +# genisovh is used to make ISOs bootable on mips. + +. $BASEDIR/tools/boot/$CODENAME/common.sh + +set -e + +N=$1 +CDROOT=$2 +if [ "$DI_WWW_HOME" = "default" ];then + DI_WWW_HOME="http://people.debian.org/~tbm/d-i/images/mips/daily/" +fi +if [ ! "$DI_DIST" ]; then + DI_DIST="$DI_CODENAME" +fi + +echo -J > $1.mkisofs_opts + +# Only disk 1* bootable +if [ $N != 1 -a $N != 1_NONUS ]; then + exit 0 +fi + +if [ ! "$DI_WWW_HOME" ];then + DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images" +else + DI_DIR="di_stuff" + wget -P "$DI_DIR/r4k-ip22" "$DI_WWW_HOME/r4k-ip22/cdrom-boot.img" + wget -P "$DI_DIR/r5k-ip22" "$DI_WWW_HOME/r5k-ip22/cdrom-boot.img" +fi +install -m 644 -D "$DI_DIR"/r4k-ip22/cdrom-boot.img "$CDROOT"/install/r4k-ip22-boot.img +install -m 644 -D "$DI_DIR"/r5k-ip22/cdrom-boot.img "$CDROOT"/install/r5k-ip22-boot.img + +install_languages $CDROOT + +exit 0 diff --git a/tools/boot/sarge/boot-sparc b/tools/boot/sarge/boot-sparc index f66c462a..a31037ad 100755 --- a/tools/boot/sarge/boot-sparc +++ b/tools/boot/sarge/boot-sparc @@ -10,8 +10,12 @@ set -e N=$1 CDDIR=$2 - -cd $CDDIR/.. +if [ "$DI_WWW_HOME" = "default" ];then + DI_WWW_HOME="http://people.debian.org/~jbailey/d-i/sparc/daily/cdrom" +fi +if [ ! "$DI_DIST" ]; then + DI_DIST="$DI_CODENAME" +fi :> $N.mkisofs_opts @@ -36,12 +40,24 @@ silo_deb=`ls $MIRROR/pool/main/s/silo/silo_*.deb | tail -1` tar zxf - -C $inst/ ./boot/{isofs,second}.b) # Some custom etc files -cp -f -p $BASEDIR/data/sparc/etc/{debian.txt,silo.conf} \ - $inst/boot/ +cp -f -p $BASEDIR/data/sarge/sparc/silo.conf $inst/boot/ +BUILD_DATE=$(date +%Y%m%d) +cat $BASEDIR/data/sarge/sparc/debian.txt \ + | sed "s/\${MEDIA_TYPE}/CDROM/" \ + | sed "s/\${DEBIAN_VERSION}/${CODENAME}/g" \ + | sed "s/\${BUILD_DATE}/${BUILD_DATE}/g" \ + > $inst/boot/debian.txt -cp CD1/dists/$CODENAME/main/disks-$ARCH/current/sun4cdm/vmlinuz \ - $inst/boot/sparc32.gz # Sparc64 kernel is so big, that uncompressing it corrupts SILO memory, so # uncompress it before hand. -zcat CD1/dists/$CODENAME/main/disks-$ARCH/current/sun4u/vmlinuz \ - > $inst/boot/sparc64 + +if [ ! "$DI_WWW_HOME" ];then + cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom/initrd.gz" "$inst/boot/initrd.gz" + cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom/vmlinuz-2.4.24-sparc32" "$inst/boot/sparc32" + zcat "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom/vmlinuz-2.4.24-sparc64" > "$inst/boot/sparc64" +else + wget "$DI_WWW_HOME/initrd.gz" -O "$inst/boot/initrd.gz" + wget "$DI_WWW_HOME/vmlinuz-2.4.24-sparc32" -O "$inst/boot/sparc32" + wget "$DI_WWW_HOME/vmlinuz-2.4.24-sparc64" + zcat vmlinuz-2.4.24-sparc64 > "$inst/boot/sparc64" +fi diff --git a/tools/boot/sarge/post-boot-hppa b/tools/boot/sarge/post-boot-hppa index d8bb3f28..906ea72a 100755 --- a/tools/boot/sarge/post-boot-hppa +++ b/tools/boot/sarge/post-boot-hppa @@ -21,10 +21,12 @@ if [ $N != 1 -a $N != 1_NONUS ]; then exit 0 fi +K32=$(ls $CDROOT/install/vmlinux-*-32) +K64=$(ls $CDROOT/install/vmlinux-*-64) /sbin/palo --commandline="0/vmlinux ramdisk_size=8192 root=/dev/ram \ initrd=0/ramdisk devfs=mount,dall init=/linuxrc DEBCONF_PRIORITY=high" \ - --recoverykernel=$CDROOT/install/vmlinux-32 \ - --recoverykernel=$CDROOT/install/vmlinux-64 \ - --bootloader=$CDROOT/install/iplboot \ - --ramdisk=$CDROOT/install/root.bin \ + --recoverykernel="$K32" \ + --recoverykernel="$K64" \ + --bootloader="$CDROOT/install/iplboot" \ + --ramdisk="$CDROOT/install/initrd.gz" \ --init-cdrom=$CDIMAGE --configfile=/dev/null diff --git a/tools/boot/sarge/post-boot-mips b/tools/boot/sarge/post-boot-mips new file mode 100755 index 00000000..fde8a3d2 --- /dev/null +++ b/tools/boot/sarge/post-boot-mips @@ -0,0 +1,32 @@ +#!/bin/bash +# +# post-boot-mips +# +# Do post-image-building tasks for mips, to make CDs bootable. +# +# $1 is the CD number +# $2 is the temporary CD build dir +# $3 is the image file + +set -e + +N=$1 +CDROOT=$2 +CDIMAGE=$3 + +cd $CDROOT/.. + +# Only disk 1* bootable +if [ $N != 1 -a $N != 1_NONUS ]; then + exit 0 +fi + +for sub in r4k-ip22 r5k-ip22; do + _start=$(isoinfo -i $CDIMAGE -lR |grep -A 10 'Directory listing of /install' |grep ${sub}-boot.img |awk '{print $10 * 4}') + _size=$(isoinfo -i $CDIMAGE -lR |grep -A 10 'Directory listing of /install' |grep ${sub}-boot.img |awk '{OFMT="%.0f"; print int(($5 + 2047) / 2048) * 2048}') + _bootfiles="${_bootfiles} ${sub}:${_start},${_size}" +done + +echo Bootfiles: ${_bootfiles} + +genisovh $CDIMAGE ${_bootfiles}