From: Ethan Benson <erbenson@alaska.net>
Date: Tue, 26 Mar 2002 14:42:58 +0000 (+0000)
Subject: Commit yaboot 1.3.4-pre2
X-Git-Tag: yaboot-1.3.13~69
X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=commitdiff_plain;h=4b9f2eb054f5f0975eef271e87ded51d6b697d9f

Commit yaboot 1.3.4-pre2

Commit yaboot 1.3.4-pre2.
git-archimport-id: erbenson@alaska.net--public/yaboot--devel--1.3--patch-6
---

diff --git a/ChangeLog b/ChangeLog
index 1052750..5daeea0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,20 @@
 # 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:
diff --git a/Makefile b/Makefile
index 4b2274e..ff02872 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 include Config
 
-VERSION = 1.3.4pre1
+VERSION = 1.3.4pre2
 # Debug mode (spam/verbose)
 DEBUG = 0
 # make install vars
diff --git a/changelog b/changelog
index b4aaafa..9f42c59 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,15 @@
+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.
diff --git a/second/file.c b/second/file.c
index 3aaef82..e4c379f 100644
--- a/second/file.c
+++ b/second/file.c
@@ -48,7 +48,7 @@ parse_device_path(char *imagepath, char *defdevice, int defpart,
      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 */
      }
 
@@ -62,6 +62,10 @@ parse_device_path(char *imagepath, char *defdevice, int defpart,
      }
 
      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;
diff --git a/second/yaboot.c b/second/yaboot.c
index 4bb67e2..5eed2a3 100644
--- a/second/yaboot.c
+++ b/second/yaboot.c
@@ -291,8 +291,10 @@ load_config_file(char *device, char* path, int partition)
     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;
 
diff --git a/ybin/ybin b/ybin/ybin
index 8b8f402..3da965e 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.4pre1
+VERSION=1.3.4pre2
 DEBUG=0
 VERBOSE=0
 TMP="${TMPDIR:-/tmp}"