From: Ethan Benson Date: Wed, 27 Mar 2002 13:25:55 +0000 (+0000) Subject: Commit yaboot 1.3.5-pre3 X-Git-Tag: yaboot-1.3.13~64 X-Git-Url: https://git.ozlabs.org/?p=yaboot.git;a=commitdiff_plain;h=6f4d7a802c09ee20526db5eeba7357d52444a42c Commit yaboot 1.3.5-pre3 Commit yaboot 1.3.5-pre3. git-archimport-id: erbenson@alaska.net--public/yaboot--devel--1.3--patch-11 --- diff --git a/ChangeLog b/ChangeLog index 61bd514..d9eeb39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,20 @@ # tag: automatic-ChangeLog--erbenson@alaska.net--public/yaboot--devel--1.3 # +2002-03-27 13:25:55 GMT Ethan Benson 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 patch-10 Summary: diff --git a/Makefile b/Makefile index b8b02c7..91fdf62 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ include Config -VERSION = 1.3.5pre2 +VERSION = 1.3.5pre3 # Debug mode (spam/verbose) DEBUG = 0 # make install vars diff --git a/man.patch b/man.patch index 707668a..bb0dd40 100644 --- a/man.patch +++ b/man.patch @@ -1,6 +1,6 @@ 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 @@ -31,8 +31,8 @@ diff -urN -x CVS man/mkofboot.8 man.deb/mkofboot.8 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: @@ -51,7 +51,7 @@ 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 -@@ -305,7 +305,7 @@ +@@ -306,7 +306,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 @@ -60,7 +60,7 @@ diff -urN -x CVS man/yaboot.conf.5 man.deb/yaboot.conf.5 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 -@@ -314,7 +314,7 @@ +@@ -315,7 +315,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. -@@ -324,7 +324,7 @@ +@@ -325,7 +325,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. -@@ -345,7 +345,7 @@ +@@ -346,7 +346,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. -@@ -593,8 +593,8 @@ +@@ -594,8 +594,8 @@ root=/dev/hda3 partition=3 timeout=20 @@ -100,7 +100,7 @@ diff -urN -x CVS man/yaboot.conf.5 man.deb/yaboot.conf.5 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 diff --git a/man/yaboot.conf.5 b/man/yaboot.conf.5 index b1371bf..eb99842 100644 --- a/man/yaboot.conf.5 +++ b/man/yaboot.conf.5 @@ -251,8 +251,9 @@ Specifies a file containing a message that is displayed before the 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 diff --git a/second/yaboot.c b/second/yaboot.c index b52b927..6eabb42 100644 --- a/second/yaboot.c +++ b/second/yaboot.c @@ -297,7 +297,7 @@ void print_message_file(char *filename) if (!msg) goto done; else - memset(msg, 0, sizeof(*msg)); + memset(msg, 0, 2001); if (file.fs->read(&file, 2000, msg) <= 0) goto done; @@ -309,10 +309,6 @@ done: 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. diff --git a/ybin/ybin b/ybin/ybin index 7a0ea80..3b5012f 100755 --- a/ybin/ybin +++ b/ybin/ybin @@ -28,7 +28,7 @@ if [ -n "$PATH_PREFIX" ] ; then fi PRG="${0##*/}" SIGINT="$PRG: Interrupt caught ... exiting" -VERSION=1.3.5pre2 +VERSION=1.3.5pre3 DEBUG=0 VERBOSE=0 TMP="${TMPDIR:-/tmp}"