diff -bpurN yaboot-1.3.17.orig/man/mkofboot.8 yaboot-1.3.17/man/mkofboot.8 --- yaboot-1.3.17.orig/man/mkofboot.8 2011-10-18 12:33:25.000000000 +1100 +++ yaboot-1.3.17/man/mkofboot.8 2011-10-18 14:51:53.540964413 +1100 @@ -88,7 +88,7 @@ utility. You should only need to define .TP .BR \-i ,\ \-\-install\ \fIboot-file Use \fIboot-file\fR as the primary boot loader executable, instead of -the default\fI/usr/local/lib/yaboot/yaboot\fR(8). +the default\fI/usr/lib/yaboot/yaboot\fR(8). .TP .BR \-C ,\ \-\-config\ \fIconfig-file Use \fIconfig-file\fR as the \fBmkofboot\fR/\fByaboot\fR(8) configuration @@ -162,8 +162,8 @@ Print out usage information and exit. Print out the version number and exit. .SH FILES .nf -/usr/local/lib/yaboot/yaboot \- boot loader executable -/usr/local/lib/yaboot/ofboot \- OpenFirmware boot script +/usr/lib/yaboot/yaboot \- boot loader executable +/usr/lib/yaboot/ofboot \- OpenFirmware boot script /etc/yaboot.conf \- boot loader/mkofboot configuration file .fi .SH ENVIRONMENT @@ -179,7 +179,7 @@ it is important that your system use a s program otherwise \fBmkofboot\fR will be vulnerable to race conditions. The Debian mktemp is derived from OpenBSD and thus should be secure. -\fI/usr/local/lib/yaboot/ofboot\fR now contains code executed by /bin/sh (by +\fI/usr/lib/yaboot/ofboot\fR now contains code executed by /bin/sh (by \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 -bpurN yaboot-1.3.17.orig/man/yaboot.conf.5 yaboot-1.3.17/man/yaboot.conf.5 --- yaboot-1.3.17.orig/man/yaboot.conf.5 2011-10-18 12:33:25.000000000 +1100 +++ yaboot-1.3.17/man/yaboot.conf.5 2011-10-18 14:51:53.541964410 +1100 @@ -136,7 +136,7 @@ Example: boot=/dev/hda2 device=hd: partition=3 - magicboot=/usr/local/lib/yaboot/ofboot + magicboot=/usr/lib/yaboot/ofboot timeout=50 root=/dev/hda3 read-only @@ -228,7 +228,7 @@ executable so this can be optional. Whe magicboot script will be executed by OF automatically at boot (instead of the \fBinstall\fR file.) See man \fBbootstrap\fR(8) for more information on this. As of ybin 0.22 you should set this to -/usr/local/lib/yaboot/ofboot which is a autoconfiguring first stage +/usr/lib/yaboot/ofboot which is a autoconfiguring first stage 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 @@ -307,7 +307,7 @@ You must also have the BSD bootloader 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 @@ -316,7 +316,7 @@ The OpenFirmware or Unix device path to 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 -work if you are using the new \fI/usr/local/lib/yaboot/ofboot\fR +work if you are 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. @@ -326,7 +326,7 @@ The OpenFirmware or unix device path to 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 -are using the new \fI/usr/local/lib/yaboot/ofboot\fR script. When +are 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. @@ -347,7 +347,7 @@ The OpenFirmware or unix device path to 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 -are using the new \fI/usr/local/lib/yaboot/ofboot\fR script. When +are 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. @@ -591,8 +591,8 @@ device=hd: root=/dev/hda3 partition=3 timeout=20 -install=/usr/local/lib/yaboot/yaboot -magicboot=/usr/local/lib/yaboot/ofboot +install=/usr/lib/yaboot/yaboot +magicboot=/usr/lib/yaboot/ofboot fgcolor=black bgcolor=green default=Linux diff -bpurN yaboot-1.3.17.orig/man/ybin.8 yaboot-1.3.17/man/ybin.8 --- yaboot-1.3.17.orig/man/ybin.8 2011-10-18 12:33:25.000000000 +1100 +++ yaboot-1.3.17/man/ybin.8 2011-10-18 14:51:53.541964410 +1100 @@ -103,7 +103,7 @@ You should only need to define this opti .TP .BR \-i ,\ \-\-install\ \fIboot-file Use \fIboot-file\fR as the primary boot loader executable, instead of -the default \fI/usr/local/lib/yaboot/yaboot\fR. +the default \fI/usr/lib/yaboot/yaboot\fR. .TP .BR \-C ,\ \-\-config\ \fIconfig-file Use \fIconfig-file\fR as the \fBybin\fR/\fByaboot\fR(8) configuration @@ -176,8 +176,8 @@ Print out usage information and exit. Print out the version number and exit. .SH FILES .nf -/usr/local/lib/yaboot/yaboot \- boot loader executable -/usr/local/lib/yaboot/ofboot \- OpenFirmware boot script +/usr/lib/yaboot/yaboot \- boot loader executable +/usr/lib/yaboot/ofboot \- OpenFirmware boot script /etc/yaboot.conf \- boot loader/ybin configuration file .fi .SH ENVIRONMENT @@ -193,7 +193,7 @@ It is important that your system use a s program, otherwise \fBybin\fR will be vulnerable to race conditions. The Debian mktemp is derived from OpenBSD and thus should be secure. -\fI/usr/local/lib/yaboot/ofboot\fR now contains code executed by /bin/sh (by +\fI/usr/lib/yaboot/ofboot\fR now contains code executed by /bin/sh (by \fBybin\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