From ae69a5b14e618bf5a8056bd7911bcefed22e9498 Mon Sep 17 00:00:00 2001 From: Frans Pop Date: Fri, 5 Dec 2008 09:08:20 +0000 Subject: [PATCH] boot-hppa: support KERNEL_PARAMS This is mainly to have the desktop= option passed correctly. Also switch to space separation in -hppa-cmdline for consistency with other architectures. --- debian/changelog | 1 + tools/boot/lenny/boot-hppa | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b9ec5770..ec704800 100644 --- a/debian/changelog +++ b/debian/changelog @@ -61,6 +61,7 @@ debian-cd (3.1.0) UNRELEASED; urgency=low [ Frans Pop ] * make_image: ensure correct quoting of variables when calling genisoimage. Closes: #507300. + * boot-hppa: support KERNEL_PARAMS (so desktop= can be passed). -- 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 3c3f3fe0..9397f8ab 100755 --- a/tools/boot/lenny/boot-hppa +++ b/tools/boot/lenny/boot-hppa @@ -54,7 +54,7 @@ K32=$(ls $CDROOT/install/vmlinux-*-parisc|head -1 | sed 's?^.*/install/?install/ 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'" +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-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"