From 1d04c047c97bfeff225ced79f3b9d5f56b489130 Mon Sep 17 00:00:00 2001
From: Sven Luther <luther@debian.org>
Date: Wed, 6 Sep 2006 19:40:15 +0000
Subject: [PATCH] [powerpc] Added a rescue option to yaboot.conf as well as the
 pegasos boot script.

---
 data/etch/pegasos/pegasos    |  8 +++++---
 data/etch/yaboot/yaboot.conf | 13 +++++++++++++
 debian/changelog             |  6 +++++-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/data/etch/pegasos/pegasos b/data/etch/pegasos/pegasos
index 7ea9fedb..b1dde629 100644
--- a/data/etch/pegasos/pegasos
+++ b/data/etch/pegasos/pegasos
@@ -9,7 +9,7 @@
 \
 \ boot menu stuff
 \
-: my-max-boot-num 3 ;
+: my-max-boot-num 4 ;
 : my-boot-default 1 ;
 : my-boot-delay d# 300 ; \ unit = 100 ms
 : my-print-menu ( -- )
@@ -29,7 +29,8 @@
   ."  "								cr
   ." 1: install"   						cr
   ." 2: expert"   						cr
-  ." 3: return to OF prompt"					cr
+  ." 3: rescue"   						cr
+  ." 4: return to OF prompt"					cr
   ."  "								cr
 ;
 : my-boot-case ( num -- )
@@ -37,7 +38,8 @@
   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 " none" endof
+    3 of " cd install/powerpc/vmlinuz-chrp.initrd devfs=mount,dall init=/linuxrc 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 d4abd509..513064f8 100644
--- a/data/etch/yaboot/yaboot.conf
+++ b/data/etch/yaboot/yaboot.conf
@@ -26,6 +26,13 @@ image=/install/powerpc/vmlinux
 	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 --"
+	initrd-size=10240
+	read-only
+
 # PowerPC 64bit subarch
 image=/install/powerpc64/vmlinux
 	label=install64
@@ -41,3 +48,9 @@ image=/install/powerpc64/vmlinux
 	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 --"
+	initrd-size=10240
+	read-only
diff --git a/debian/changelog b/debian/changelog
index 9f55ec0f..b87e7d8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -136,7 +136,11 @@ debian-cd (2.2.25) UNRELEASED; urgency=low
   [ Colin Watson ]
   * Cope with cdrom64 -> cdrom renaming for powerpc64 subarchitecture.
 
- -- Joey Hess <joeyh@debian.org>  Tue, 22 Aug 2006 17:57:09 -0400
+  [ Sven Luther ]
+  * [powerpc] Added a rescue option to yaboot.conf as well as the 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