X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=man.patch;h=5e4e6befa14886478ae9fc5ba73d1a4603369eaf;hp=18c7f002a88defde8e74df76b938df4e52d6e6e1;hb=b58b7f84f40f96f61a1d5fc1f88a1abd9c1a4193;hpb=f4ebbd9f7ea23e3f0fcbe098754580c220894628 diff --git a/man.patch b/man.patch index 18c7f00..5e4e6be 100644 --- a/man.patch +++ b/man.patch @@ -1,7 +1,7 @@ -diff -urN -X CVS man/mkofboot.8 man.deb/mkofboot.8 ---- man/mkofboot.8 Thu May 24 04:32:54 2001 -+++ man.deb/mkofboot.8 Mon Aug 6 03:01:39 2001 -@@ -94,7 +94,7 @@ +diff -urN -x CVS man/mkofboot.8 man.deb/mkofboot.8 +--- man/mkofboot.8 Wed Nov 21 04:08:07 2001 ++++ man.deb/mkofboot.8 Wed Nov 21 04:09:00 2001 +@@ -88,7 +88,7 @@ .TP .BR \-i ,\ \-\-install\ \fIboot-file Use \fIboot-file\fR as the primary boot loader executable, instead of @@ -10,7 +10,7 @@ diff -urN -X CVS man/mkofboot.8 man.deb/mkofboot.8 .TP .BR \-C ,\ \-\-config\ \fIconfig-file Use \fIconfig-file\fR as the \fBmkofboot\fR/\fByaboot\fR(8) configuration -@@ -200,8 +200,8 @@ +@@ -162,8 +162,8 @@ Print out the version number and exit. .SH FILES .nf @@ -21,7 +21,7 @@ diff -urN -X CVS man/mkofboot.8 man.deb/mkofboot.8 /etc/yaboot.conf \- boot loader/mkofboot configuration file .fi .SH ENVIRONMENT -@@ -218,7 +218,7 @@ +@@ -179,7 +179,7 @@ program otherwise \fBmkofboot\fR will be vulnerable to race conditions. The Debian mktemp is derived from OpenBSD and thus should be secure. @@ -30,9 +30,9 @@ diff -urN -X CVS man/mkofboot.8 man.deb/mkofboot.8 \fBmkofboot\fR) it is thus critical that it not be writable by anyone but root. It is also critical that \fI/etc/yaboot.conf\fR not be writable by anyone but root since a different \fIofboot\fR script could be -diff -urN -X CVS man/yaboot.conf.5 man.deb/yaboot.conf.5 ---- man/yaboot.conf.5 Mon Aug 6 02:43:23 2001 -+++ man.deb/yaboot.conf.5 Mon Aug 6 03:01:39 2001 +diff -urN -x CVS man/yaboot.conf.5 man.deb/yaboot.conf.5 +--- man/yaboot.conf.5 Sun Oct 28 00:09:33 2001 ++++ man.deb/yaboot.conf.5 Wed Nov 21 04:09:00 2001 @@ -136,7 +136,7 @@ boot=/dev/hda2 device=hd: @@ -51,16 +51,16 @@ diff -urN -X CVS man/yaboot.conf.5 man.deb/yaboot.conf.5 loader for yaboot. It is capable of presenting a dual boot menu for GNU/Linux, MacOS and MacOSX. If dual booting is not required or configured it will simply load yaboot directly. You must specify this -@@ -299,7 +299,7 @@ - option you will be presented with a simple menu at bootup allowing you - to hit L to boot GNU/Linux or B to boot BSD (along with other choices - if configured). This will only work if you are using the new --\fI/usr/local/lib/yaboot/ofboot\fR script. When this is set to a unix -+\fI/usr/lib/yaboot/ofboot\fR script. When this is set to a unix - device node (ie \fI/dev/hda11\fR) then ybin will use the +@@ -307,7 +307,7 @@ + When you define this option you will be presented with a simple menu at + bootup allowing you to hit L to boot GNU/Linux or B to boot BSD (along + with other choices if configured). This will only work if you are +-using the new \fI/usr/local/lib/yaboot/ofboot\fR script. When this is ++using the new \fI/usr/lib/yaboot/ofboot\fR script. When this is + set to a unix device node (ie \fI/dev/hda11\fR) then ybin will use the \fBofpath\fR(8) utility to determine the OpenFirmware device path. .TP -@@ -308,7 +308,7 @@ +@@ -316,7 +316,7 @@ partition. When you define this option you will be presented with a simple menu at bootup allowing you to hit L to boot GNU/Linux or M to boot MacOS (along with other choices if configured). This will only @@ -69,7 +69,7 @@ diff -urN -X CVS man/yaboot.conf.5 man.deb/yaboot.conf.5 script. When this is set to a unix device node (ie \fI/dev/hda11\fR) then ybin will use the \fBofpath\fR(8) utility to determine the OpenFirmware device path. -@@ -318,7 +318,7 @@ +@@ -326,7 +326,7 @@ When you define this option you will be presented with a simple menu at bootup allowing you to hit L to boot GNU/Linux or X to boot MacOSX (along with other choices if configured). This will only work if you @@ -78,7 +78,7 @@ diff -urN -X CVS man/yaboot.conf.5 man.deb/yaboot.conf.5 this is set to a unix device node (ie \fI/dev/hda11\fR) then ybin will use the \fBofpath\fR(8) utility to determine the OpenFirmware device path. -@@ -339,7 +339,7 @@ +@@ -347,7 +347,7 @@ When you define this option you will be presented with a simple menu at bootup allowing you to hit L to boot GNU/Linux or D to boot Darwin (along with other choices if configured). This will only work if you @@ -87,7 +87,7 @@ diff -urN -X CVS man/yaboot.conf.5 man.deb/yaboot.conf.5 this is set to a unix device node (ie \fI/dev/hda11\fR) then ybin will use the \fBofpath\fR(8) utility to determine the OpenFirmware device path. -@@ -587,8 +587,8 @@ +@@ -595,8 +595,8 @@ root=/dev/hda3 partition=3 timeout=20 @@ -98,10 +98,10 @@ diff -urN -X CVS man/yaboot.conf.5 man.deb/yaboot.conf.5 fgcolor=black bgcolor=green default=Linux -diff -urN -X CVS man/ybin.8 man.deb/ybin.8 ---- man/ybin.8 Thu May 24 04:33:16 2001 -+++ man.deb/ybin.8 Mon Aug 6 03:01:39 2001 -@@ -109,7 +109,7 @@ +diff -urN -x CVS man/ybin.8 man.deb/ybin.8 +--- man/ybin.8 Wed Nov 21 04:08:35 2001 ++++ man.deb/ybin.8 Wed Nov 21 04:09:00 2001 +@@ -103,7 +103,7 @@ .TP .BR \-i ,\ \-\-install\ \fIboot-file Use \fIboot-file\fR as the primary boot loader executable, instead of @@ -110,7 +110,7 @@ diff -urN -X CVS man/ybin.8 man.deb/ybin.8 .TP .BR \-C ,\ \-\-config\ \fIconfig-file Use \fIconfig-file\fR as the \fBybin\fR/\fByaboot\fR(8) configuration -@@ -214,8 +214,8 @@ +@@ -176,8 +176,8 @@ Print out the version number and exit. .SH FILES .nf @@ -121,7 +121,7 @@ diff -urN -X CVS man/ybin.8 man.deb/ybin.8 /etc/yaboot.conf \- boot loader/ybin configuration file .fi .SH ENVIRONMENT -@@ -232,7 +232,7 @@ +@@ -193,7 +193,7 @@ program, otherwise \fBybin\fR will be vulnerable to race conditions. The Debian mktemp is derived from OpenBSD and thus should be secure.