From c017d3cf55f4ec18f6fb6c4f7041ed43ed3346d9 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 27 Apr 2006 14:05:22 +0000 Subject: [PATCH] * Only tell mkisofs to use the prep initrd if it's available (which it currently isn't for 2.6.16). --- debian/changelog | 4 ++++ tools/boot/etch/boot-powerpc | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5de59127..8e88e28f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,10 @@ debian-cd (2.2.25) UNRELEASED; urgency=low Makes full/netinst images have base_installable again. * Thiemo Seufer has resumed building images for mips. + [ Colin Watson ] + * Only tell mkisofs to use the prep initrd if it's available (which it + currently isn't for 2.6.16). + -- Frans Pop Sun, 23 Apr 2006 20:09:44 +0200 debian-cd (2.2.24) unstable; urgency=low diff --git a/tools/boot/etch/boot-powerpc b/tools/boot/etch/boot-powerpc index a5c04486..36075c52 100755 --- a/tools/boot/etch/boot-powerpc +++ b/tools/boot/etch/boot-powerpc @@ -38,8 +38,6 @@ install_languages $CDDIR echo -n " --iso-level 2 --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/powerpc/vmlinuz-prep.initrd" >> $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 @@ -103,6 +101,11 @@ do done +if [ -f powerpc/vmlinuz-prep.initrd ]; then + # We are still missing this for prep + echo -n " -prep-boot install/powerpc/vmlinuz-prep.initrd" >> $CDDIR/../$N.mkisofs_opts +fi + # Copy pegasos forth script, since pegasos machines don't support yaboot yet. BUILD_DATE=$(date +%Y%m%d) cat $BASEDIR/data/$DI_CODENAME/pegasos/pegasos \