diff --git a/debian/changelog b/debian/changelog index 367ffa6b..51a34bc0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -143,6 +143,7 @@ debian-cd (2.2.25) UNRELEASED; urgency=low [ Colin Watson ] * Remove obsolete devfs=mount,dall and init=/linuxrc options from yaboot.conf and pegasos boot script. + * Remove init=/linuxrc from hppa. -- Sven Luther Wed, 6 Sep 2006 21:38:33 +0200 diff --git a/tools/boot/etch/boot-hppa b/tools/boot/etch/boot-hppa index 48453253..ef536d21 100755 --- a/tools/boot/etch/boot-hppa +++ b/tools/boot/etch/boot-hppa @@ -56,7 +56,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) -echo " -hppa-cmdline '0/vmlinux,root=/dev/ram,initrd=0/ramdisk,ramdisk_size=$RSIZE,init=/linuxrc'" >> $1.mkisofs_opts +echo " -hppa-cmdline '0/vmlinux,root=/dev/ram,initrd=0/ramdisk,ramdisk_size=$RSIZE'" >> $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 diff --git a/tools/boot/etch/post-boot-hppa b/tools/boot/etch/post-boot-hppa index 95218a39..cc576de0 100755 --- a/tools/boot/etch/post-boot-hppa +++ b/tools/boot/etch/post-boot-hppa @@ -25,7 +25,7 @@ K32=$(ls $CDROOT/install/vmlinux-*-parisc|head -1) K64=$(ls $CDROOT/install/vmlinux-*-parisc64|head -1) RSIZE=$(expr $(zcat "$CDROOT/install/initrd.gz" | wc --bytes) / 1024) /sbin/palo \ - --commandline="0/vmlinux root=/dev/ram initrd=0/ramdisk ramdisk_size=$RSIZE init=/linuxrc" \ + --commandline="0/vmlinux root=/dev/ram initrd=0/ramdisk ramdisk_size=$RSIZE" \ --recoverykernel="$K32" \ --recoverykernel="$K64" \ --bootloader="$CDROOT/install/iplboot" \