Commit yaboot 1.3.5-pre3.
git-archimport-id: erbenson@alaska.net--public/yaboot--devel--1.3--patch-11
# tag: automatic-ChangeLog--erbenson@alaska.net--public/yaboot--devel--1.3
#
# tag: automatic-ChangeLog--erbenson@alaska.net--public/yaboot--devel--1.3
#
+2002-03-27 13:25:55 GMT Ethan Benson <erbenson@alaska.net> patch-11
+
+ Summary:
+ Commit yaboot 1.3.5-pre3
+ Revision:
+ yaboot--devel--1.3--patch-11
+
+ Commit yaboot 1.3.5-pre3.
+
+ modified files:
+ ChangeLog Makefile man.patch man/yaboot.conf.5 second/yaboot.c
+ ybin/ybin
+
+
2002-03-27 13:22:23 GMT Ethan Benson <erbenson@alaska.net> patch-10
Summary:
2002-03-27 13:22:23 GMT Ethan Benson <erbenson@alaska.net> patch-10
Summary:
# Debug mode (spam/verbose)
DEBUG = 0
# make install vars
# Debug mode (spam/verbose)
DEBUG = 0
# make install vars
diff -urN -x CVS man/mkofboot.8 man.deb/mkofboot.8
--- man/mkofboot.8 Thu May 24 04:32:54 2001
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 Thu Oct 25 05:06:35 2001
++++ man.deb/mkofboot.8 Thu Oct 25 05:43:57 2001
@@ -94,7 +94,7 @@
.TP
.BR \-i ,\ \-\-install\ \fIboot-file
@@ -94,7 +94,7 @@
.TP
.BR \-i ,\ \-\-install\ \fIboot-file
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
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 Thu Oct 25 05:06:22 2001
-+++ man.deb/yaboot.conf.5 Thu Oct 25 05:06:35 2001
+--- man/yaboot.conf.5 Thu Oct 25 05:43:33 2001
++++ man.deb/yaboot.conf.5 Thu Oct 25 05:43:57 2001
@@ -136,7 +136,7 @@
boot=/dev/hda2
device=hd:
@@ -136,7 +136,7 @@
boot=/dev/hda2
device=hd:
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
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
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
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
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
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
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
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
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.
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.
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
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
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.
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.
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
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
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.
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.
root=/dev/hda3
partition=3
timeout=20
root=/dev/hda3
partition=3
timeout=20
default=Linux
diff -urN -x CVS man/ybin.8 man.deb/ybin.8
--- man/ybin.8 Thu May 24 04:33:16 2001
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 Thu Oct 25 05:06:35 2001
++++ man.deb/ybin.8 Thu Oct 25 05:43:57 2001
@@ -109,7 +109,7 @@
.TP
.BR \-i ,\ \-\-install\ \fIboot-file
@@ -109,7 +109,7 @@
.TP
.BR \-i ,\ \-\-install\ \fIboot-file
boot prompt. You may specify either a plain pathname, in which case
the default device and partition will be derived from the
\fIdevice=\fR and \fIpartition=\fR lines in the global section of
boot prompt. You may specify either a plain pathname, in which case
the default device and partition will be derived from the
\fIdevice=\fR and \fIpartition=\fR lines in the global section of
-\fByaboot.conf\fR, or you can specify a full OpenFirmware device
-path. Note: only the first 2000 bytes of this file will be read.
+\fByaboot.conf\fR, or you can specify a full OpenFirmware device path.
+The message file must be plain ASCII text with UNIX newlines. Note:
+only the first 2000 bytes of this file will be read.
.TP
.BI "password=" password
Protect booting by a password. The password is given in either
.TP
.BI "password=" password
Protect booting by a password. The password is given in either
if (!msg)
goto done;
else
if (!msg)
goto done;
else
- memset(msg, 0, sizeof(*msg));
if (file.fs->read(&file, 2000, msg) <= 0)
goto done;
if (file.fs->read(&file, 2000, msg) <= 0)
goto done;
file.fs->close(&file);
if (msg)
free(msg);
file.fs->close(&file);
if (msg)
free(msg);
- if (p)
- free(p);
- if (endp)
- free(endp);
}
/* Currently, the config file must be at the root of the filesystem.
}
/* Currently, the config file must be at the root of the filesystem.
fi
PRG="${0##*/}"
SIGINT="$PRG: Interrupt caught ... exiting"
fi
PRG="${0##*/}"
SIGINT="$PRG: Interrupt caught ... exiting"
DEBUG=0
VERBOSE=0
TMP="${TMPDIR:-/tmp}"
DEBUG=0
VERBOSE=0
TMP="${TMPDIR:-/tmp}"