From ae92289c9589aefeb317ed0790f977b5c4a0662c Mon Sep 17 00:00:00 2001 From: Santiago Garcia Mantinan Date: Thu, 19 Aug 2004 11:28:21 +0000 Subject: [PATCH] Add chrp-boot to powerpc and try to fix HFS catalog size problems. Update debian-installer task. --- debian/changelog | 1 + tasks/debian-installer | 23 ++++++++++++++++++----- tools/boot/sarge/boot-powerpc | 14 +++++++++++++- 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 69e4683f..7ff14a05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -107,6 +107,7 @@ debian-cd (2.2.18) UNRELEASED; urgency=low - 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. + - Add chrp-boot to powerpc and try to fix HFS catalog size problems. * 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 diff --git a/tasks/debian-installer b/tasks/debian-installer index 19cc1036..c895c0fc 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: Wed Aug 4 15:44:38 MDT 2004 + * Last update: Wed Aug 18 15:52:58 MDT 2004 */ #ifdef ARCH_alpha aboot-installer @@ -279,6 +279,7 @@ ethdetect evms-udeb fbset-udeb fdisk-udeb +hdparm-udeb hw-detect-full ipv6-modules-2.4.25-32-di ipv6-modules-2.4.25-64-di @@ -315,6 +316,7 @@ network-console nic-modules-2.4.25-32-di nic-modules-2.4.25-64-di nobootloader +ntfstools-udeb openssh-client-udeb openssh-server-udeb os-prober @@ -381,7 +383,9 @@ lvmcfg-utils mdcfg mdcfg-utils net-retriever +network-console nobootloader +os-prober parted-udeb partman-auto partman-basicfilesystems @@ -436,6 +440,7 @@ firmware-modules-2.6.7-1-386-di floppy-modules-2.4.26-1-386-di floppy-modules-2.6.7-1-386-di grub-installer +hdparm-udeb hw-detect-full ipv6-modules-2.4.26-1-386-di ipv6-modules-2.6.7-1-386-di @@ -490,6 +495,7 @@ nic-usb-modules-2.6.7-1-386-di nobootloader ntfs-modules-2.4.26-1-386-di ntfs-modules-2.6.7-1-386-di +ntfstools-udeb openssh-client-udeb openssh-server-udeb os-prober @@ -591,6 +597,7 @@ fdisk-udeb firewire-core-modules-2.4.26-itanium-smp-di firewire-core-modules-2.6.7-1-itanium-smp-di firmware-modules-2.6.7-1-itanium-smp-di +hdparm-udeb hw-detect-full ide-core-modules-2.4.26-itanium-smp-di ide-core-modules-2.6.7-1-itanium-smp-di @@ -642,6 +649,7 @@ nic-shared-modules-2.6.7-1-itanium-smp-di nic-usb-modules-2.6.7-1-itanium-smp-di nobootloader ntfs-modules-2.6.7-1-itanium-smp-di +ntfstools-udeb openssh-client-udeb openssh-server-udeb os-prober @@ -654,6 +662,7 @@ partman partman-auto partman-basicfilesystems partman-basicmethods +partman-efi partman-ext3 partman-jfs partman-lvm @@ -737,9 +746,9 @@ fat-modules-2.4.26-mvme147-di fat-modules-2.4.26-mvme16x-di fat-modules-2.4.26-q40-di fbset-udeb +hdparm-udeb hw-detect-full ipv6-modules-2.2.25-mac-di -ipv6-modules-2.4.25-amiga-di iso-3166-udeb jfs-modules-2.4.25-amiga-di jfs-modules-2.4.26-amiga-di @@ -889,6 +898,7 @@ evms-udeb fat-modules-2.4.26-sb1-swarm-bn-di fbset-udeb fdisk-udeb +hdparm-udeb hw-detect-full ipv6-modules-2.4.26-r4k-ip22-di ipv6-modules-2.4.26-r5k-ip22-di @@ -964,6 +974,7 @@ sata-modules-2.4.26-sb1-swarm-bn-di scsi-common-modules-2.4.26-sb1-swarm-bn-di scsi-core-modules-2.4.26-sb1-swarm-bn-di scsi-modules-2.4.26-sb1-swarm-bn-di +sibyl-installer usb-storage-modules-2.4.26-sb1-swarm-bn-di userdevfs wireless-tools-udeb @@ -1013,6 +1024,7 @@ fat-modules-2.4.26-r5k-cobalt-di fat-modules-2.4.26-sb1-swarm-bn-di fbset-udeb fdisk-udeb +hdparm-udeb hw-detect-full ipv6-modules-2.4.26-r3k-kn02-di ipv6-modules-2.4.26-r4k-kn04-di @@ -1091,6 +1103,7 @@ sata-modules-2.4.26-sb1-swarm-bn-di scsi-common-modules-2.4.26-sb1-swarm-bn-di scsi-core-modules-2.4.26-sb1-swarm-bn-di scsi-modules-2.4.26-sb1-swarm-bn-di +sibyl-installer usb-storage-modules-2.4.26-sb1-swarm-bn-di userdevfs wireless-tools-udeb @@ -1166,6 +1179,7 @@ floppy-modules-2.4.25-powerpc-small-di floppy-modules-2.6.7-power3-di floppy-modules-2.6.7-power4-di floppy-modules-2.6.7-powerpc-di +hdparm-udeb hfs-modules-2.4.25-power3-di hfs-modules-2.4.25-power4-di hfs-modules-2.4.25-powerpc-di @@ -1376,6 +1390,7 @@ ethdetect evms-udeb fbset-udeb fdisk-udeb +hdparm-udeb hw-detect-full iso-3166-udeb jfsutils-udeb @@ -1405,9 +1420,9 @@ mii-diag-udeb mkreiserfs-udeb net-retriever network-console -nic-modules-2.4.21-1-s390-di nic-modules-2.4.26-1-s390-di nobootloader +ntfstools-udeb openssh-client-udeb openssh-server-udeb os-prober @@ -1434,9 +1449,7 @@ raidtools2-udeb s390-dasd s390-netdevice s390-tools-udeb -scsi-core-modules-2.4.21-1-s390-di scsi-core-modules-2.4.26-1-s390-di -scsi-modules-2.4.21-1-s390-di scsi-modules-2.4.26-1-s390-di userdevfs wireless-tools-udeb diff --git a/tools/boot/sarge/boot-powerpc b/tools/boot/sarge/boot-powerpc index c9c96b8c..7f2dd74c 100755 --- a/tools/boot/sarge/boot-powerpc +++ b/tools/boot/sarge/boot-powerpc @@ -31,13 +31,25 @@ fi install_languages $CDDIR -echo -n "--netatalk -hfs -probe -map $BASEDIR/data/hfs.map" \ +echo -n "--chrp-boot --netatalk -hfs -probe -map $BASEDIR/data/hfs.map" \ > $N.mkisofs_opts # We are still missing this for prep #echo -n " -prep-boot install/prep/boot.bin" >> $N.mkisofs_opts # For newworld Mac booting - Note, no spaces in volid! echo -n " -part -no-desktop -hfs-bless CD$N/install -hfs-volid Debian/PowerPC_${CODENAME}" \ >> $N.mkisofs_opts +# Recommended size for a HFS Catalog is 4 megas per giga, defaults to 4 megas +if [ -n "$SIZELIMIT1" ];then + if [ "$SIZELIMIT1" -gt 1000000000 ];then + let newsize="$SIZELIMIT1"/256 + echo "-hfs-parms MAX_XTCSIZE=$newsize" >> $N.mkisofs_opts + fi +else + if [ -n "$SIZELIMIT" ] && [ "$SIZELIMIT" -gt 1000000000 ];then + let newsize="$SIZELIMIT"/256 + echo "-hfs-parms MAX_XTCSIZE=$newsize" >> $N.mkisofs_opts + fi +fi cd $INSTALLDIR # Extract yaboot from the archive