diff --git a/debian/changelog b/debian/changelog index ec704800..fc73d4a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -62,6 +62,7 @@ debian-cd (3.1.0) UNRELEASED; urgency=low * make_image: ensure correct quoting of variables when calling genisoimage. Closes: #507300. * boot-hppa: support KERNEL_PARAMS (so desktop= can be passed). + * boot-hppa: stop passing redundant boot parameters root and ramdisk_size. -- Frans Pop Fri, 05 Dec 2008 10:04:03 +0100 diff --git a/tools/boot/lenny/boot-hppa b/tools/boot/lenny/boot-hppa index 9397f8ab..7f03eaa3 100755 --- a/tools/boot/lenny/boot-hppa +++ b/tools/boot/lenny/boot-hppa @@ -52,9 +52,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) -add_mkisofs_opt $CDROOT/../$1.mkisofs_opts "-hppa-cmdline '0/vmlinux root=/dev/ram initrd=0/ramdisk ramdisk_size=$RSIZE${KERNEL_PARAMS:+ $KERNEL_PARAMS}'" +add_mkisofs_opt $CDROOT/../$1.mkisofs_opts "-hppa-cmdline '0/vmlinux initrd=0/ramdisk${KERNEL_PARAMS:+ $KERNEL_PARAMS}'" add_mkisofs_opt $CDROOT/../$1.mkisofs_opts "-hppa-kernel-32 $K32" add_mkisofs_opt $CDROOT/../$1.mkisofs_opts "-hppa-kernel-64 $K64" add_mkisofs_opt $CDROOT/../$1.mkisofs_opts "-hppa-bootloader install/iplboot"