Commit yaboot 1.3.4-pre2.
git-archimport-id: erbenson@alaska.net--public/yaboot--devel--1.3--patch-6
# tag: automatic-ChangeLog--erbenson@alaska.net--public/yaboot--devel--1.3
#
+2002-03-26 14:42:58 GMT Ethan Benson <erbenson@alaska.net> patch-6
+
+ Summary:
+ Commit yaboot 1.3.4-pre2
+ Revision:
+ yaboot--devel--1.3--patch-6
+
+ Commit yaboot 1.3.4-pre2.
+
+ modified files:
+ ChangeLog Makefile changelog second/file.c second/yaboot.c
+ ybin/ybin
+
+
2002-03-25 15:13:19 GMT Ethan Benson <erbenson@alaska.net> patch-5
Summary:
include Config
-VERSION = 1.3.4pre1
+VERSION = 1.3.4pre2
# Debug mode (spam/verbose)
DEBUG = 0
# make install vars
+2001-10-10 Ethan Benson <erbenson@alaska.net>
+
+ * Version 1.3.4pre2
+
+ * yaboot:
+ - Fix netboot when using the `n' key.
+ - Make configuration file open error consistent with other file
+ open errors.
+
2001-10-09 Ethan Benson <erbenson@alaska.net>
- * Version 1.3.4-pre1
+ * Version 1.3.4pre1
* yaboot:
- Add SGI XFS filesystem support.
result->file = NULL;
if (!strstr(defdev, "ethernet") && !strstr(defdev, "enet")) {
- if ((ptr = strchr(defdev, ':')) != NULL)
+ if ((ptr = strrchr(defdev, ':')) != NULL)
*ptr = 0; /* remove trailing : from defdevice if necessary */
}
}
if (strstr(ipath, "ethernet") || strstr(ipath, "enet"))
+ if ((ptr = strstr(ipath, "bootp")) != NULL) { /* `n' key booting boots enet:bootp */
+ *ptr = 0;
+ result->dev = strdup(ipath);
+ } else
result->dev = strdup(ipath);
else if ((ptr = strchr(ipath, ':')) != NULL) {
*ptr = 0;
fspec.part = partition;
result = open_file(&fspec, &file);
if (result != FILE_ERR_OK) {
- prom_printf("Can't open config file '%s', err: %d\n", conf_path, result);
- goto bail;
+ prom_printf("%s:%d", fspec.dev, fspec.part);
+ prom_perror(result, fspec.file);
+ prom_printf("Can't open config file\n");
+ goto bail;
}
opened = 1;
fi
PRG="${0##*/}"
SIGINT="$PRG: Interrupt caught ... exiting"
-VERSION=1.3.4pre1
+VERSION=1.3.4pre2
DEBUG=0
VERBOSE=0
TMP="${TMPDIR:-/tmp}"