From d12d0a34d03f60a468e1d36e323bb6e79aa1efaf Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 15 Sep 2006 08:51:45 +0000 Subject: [PATCH] * Remove obsolete devfs=mount,dall and init=/linuxrc options from yaboot.conf and pegasos boot script. --- data/etch/pegasos/pegasos | 6 +++--- data/etch/yaboot/yaboot.conf | 12 ++++++------ debian/changelog | 4 ++++ 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/data/etch/pegasos/pegasos b/data/etch/pegasos/pegasos index b1dde629..57da5445 100644 --- a/data/etch/pegasos/pegasos +++ b/data/etch/pegasos/pegasos @@ -36,9 +36,9 @@ : my-boot-case ( num -- ) ." " cr case - 1 of " cd install/powerpc/vmlinuz-chrp.initrd devfs=mount,dall init=/linuxrc --" endof - 2 of " cd install/powerpc/vmlinuz-chrp.initrd DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc --" endof - 3 of " cd install/powerpc/vmlinuz-chrp.initrd devfs=mount,dall init=/linuxrc rescue/enable=true --" endof + 1 of " cd install/powerpc/vmlinuz-chrp.initrd --" endof + 2 of " cd install/powerpc/vmlinuz-chrp.initrd DEBCONF_PRIORITY=low --" endof + 3 of " cd install/powerpc/vmlinuz-chrp.initrd rescue/enable=true --" endof 4 of " none" endof endcase $boot diff --git a/data/etch/yaboot/yaboot.conf b/data/etch/yaboot/yaboot.conf index 513064f8..b874a9bf 100644 --- a/data/etch/yaboot/yaboot.conf +++ b/data/etch/yaboot/yaboot.conf @@ -15,21 +15,21 @@ message=/install/boot.msg image=/install/powerpc/vmlinux label=install initrd=/install/powerpc/initrd.gz - append="devfs=mount,dall init=/linuxrc --" + append="--" initrd-size=10240 read-only image=/install/powerpc/vmlinux label=expert initrd=/install/powerpc/initrd.gz - append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc --" + append="DEBCONF_PRIORITY=low --" initrd-size=10240 read-only image=/install/powerpc/vmlinux label=rescue initrd=/install/powerpc/initrd.gz - append="devfs=mount,dall init=/linuxrc rescue/enable=true --" + append="rescue/enable=true --" initrd-size=10240 read-only @@ -37,20 +37,20 @@ image=/install/powerpc/vmlinux image=/install/powerpc64/vmlinux label=install64 initrd=/install/powerpc64/initrd.gz - append="devfs=mount,dall init=/linuxrc --" + append="--" initrd-size=10240 read-only image=/install/powerpc64/vmlinux label=expert64 initrd=/install/powerpc64/initrd.gz - append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc --" + append="DEBCONF_PRIORITY=low --" initrd-size=10240 read-only image=/install/powerpc64/vmlinux label=rescue64 initrd=/install/powerpc64/initrd.gz - append="devfs=mount,dall init=/linuxrc rescue/enable=true --" + append="rescue/enable=true --" initrd-size=10240 read-only diff --git a/debian/changelog b/debian/changelog index b87e7d8f..367ffa6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -140,6 +140,10 @@ debian-cd (2.2.25) UNRELEASED; urgency=low * [powerpc] Added a rescue option to yaboot.conf as well as the pegasos boot script. + [ Colin Watson ] + * Remove obsolete devfs=mount,dall and init=/linuxrc options from + yaboot.conf and pegasos boot script. + -- Sven Luther Wed, 6 Sep 2006 21:38:33 +0200 debian-cd (2.2.24) unstable; urgency=low