* Remove obsolete devfs=mount,dall and init=/linuxrc options from

yaboot.conf and pegasos boot script.

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

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

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 <sven@tael.powerlinux.fr>  Wed,  6 Sep 2006 21:38:33 +0200
 
 debian-cd (2.2.24) unstable; urgency=low