From ddf215a939c5531101788bba9a4f7306f81a7be2 Mon Sep 17 00:00:00 2001 From: Frans Pop Date: Sun, 22 Oct 2006 22:42:44 +0000 Subject: [PATCH] Also remove no longer needed boot parameters for hppa --- debian/changelog | 6 +++--- tools/boot/etch/boot-hppa | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2ebe83be..a6bf4539 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,10 +20,10 @@ debian-cd (2.2.26) UNRELEASED; urgency=low * Increase alpha hardcoded ramdisk_size to 20 mb, 16 is too small now. [ Frans Pop ] - * Remove boot parameters from silo.conf that are no longer needed after - switch to initramfs initrds. + * Remove boot parameters that are no longer needed after switch to initramfs + initrds for sparc and hppa. - -- Frans Pop Mon, 23 Oct 2006 00:35:44 +0200 + -- Frans Pop Mon, 23 Oct 2006 00:41:07 +0200 debian-cd (2.2.25) unstable; urgency=low diff --git a/tools/boot/etch/boot-hppa b/tools/boot/etch/boot-hppa index ef536d21..8c0d616f 100755 --- a/tools/boot/etch/boot-hppa +++ b/tools/boot/etch/boot-hppa @@ -54,9 +54,8 @@ install_languages "$CDROOT" K32=$(ls $CDROOT/install/vmlinux-*-parisc|head -1 | sed 's?^.*/install/?install/?g') K64=$(ls $CDROOT/install/vmlinux-*-parisc64|head -1 | sed 's?^.*/install/?install/?g') -RSIZE=$(expr $(zcat "$CDROOT/install/initrd.gz" | wc --bytes) / 1024) -echo " -hppa-cmdline '0/vmlinux,root=/dev/ram,initrd=0/ramdisk,ramdisk_size=$RSIZE'" >> $1.mkisofs_opts +echo " -hppa-cmdline '0/vmlinux,initrd=0/ramdisk'" >> $1.mkisofs_opts echo " -hppa-kernel-32 $K32" >> $1.mkisofs_opts echo " -hppa-kernel-64 $K64" >> $1.mkisofs_opts echo " -hppa-bootloader install/iplboot" >> $1.mkisofs_opts