rpms/yaboot/devel yaboot-1.3.13-netboot.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: pnasrat

Update of /cvs/dist/rpms/yaboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31555

Modified Files:
	yaboot-1.3.13-netboot.patch 
Log Message:
Updated vesrsion of patch

yaboot-1.3.13-netboot.patch:
 file.c |  143 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 124 insertions(+), 19 deletions(-)

Index: yaboot-1.3.13-netboot.patch
===================================================================
RCS file: /cvs/dist/rpms/yaboot/devel/yaboot-1.3.13-netboot.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yaboot-1.3.13-netboot.patch	17 Aug 2005 22:08:19 -0000	1.1
+++ yaboot-1.3.13-netboot.patch	12 Sep 2005 15:13:47 -0000	1.2
@@ -1,5 +1,5 @@
---- yaboot-1.3.13/second/file.c.netboot	2005-08-17 18:04:53.000000000 -0400
-+++ yaboot-1.3.13/second/file.c	2005-08-17 18:05:12.000000000 -0400
+--- yaboot-1.3.13/second/file.c.netboot	2005-09-12 11:12:44.000000000 -0400
++++ yaboot-1.3.13/second/file.c	2005-09-12 11:12:52.000000000 -0400
 @@ -38,6 +38,112 @@
  
  extern char bootdevice[1024];
@@ -121,14 +121,17 @@
  
       result->dev = NULL;
       result->part = -1;
-@@ -81,39 +188,21 @@
+@@ -81,20 +188,16 @@
       else
  	  ipath = strdup(imagepath);
  
 -     if (defdevice)
 +     if (defdevice) {
  	  defdev = strdup(defdevice);
--
++	  device_kind = prom_get_devtype(defdev);
++     } else
++	  device_kind = prom_get_devtype(ipath);
+ 
 -     if (defdev) {
 -	  if (!strstr(defdev, "ethernet") && !strstr(defdev, "enet")) {
 -	       if ((ptr = strrchr(defdev, ':')) != NULL)
@@ -140,18 +143,17 @@
 -        use strrchr() since enet:,10.0.0.1,file is legal */
 -
 -     if (strchr(ipath, ':') != NULL) {
--	  if ((ptr = strrchr(ipath, ',')) != NULL) {
--	       char *colon = strrchr(ipath, ':');
--	       /* If a ':' occurs *after* a ',', then we assume that there is
--		  no filename */
--	       if (!colon || colon < ptr) {
--		    result->file = strdup(ptr+1);
--		    /* Trim the filename off */
--		    *ptr = 0;
--	       }
--	  }
--     }
--
++     /* This will not properly handle an obp-tftp argument list
++      * with elements after the filename; that is handled below.
++      */
++     if (device_kind != FILE_DEVICE_NET && strchr(ipath, ':') != NULL) {
+ 	  if ((ptr = strrchr(ipath, ',')) != NULL) {
+ 	       char *colon = strrchr(ipath, ':');
+ 	       /* If a ':' occurs *after* a ',', then we assume that there is
+@@ -107,13 +210,15 @@
+ 	  }
+      }
+ 
 -     if (strstr(ipath, "ethernet") || strstr(ipath, "enet"))
 -	  if ((ptr = strstr(ipath, "bootp")) != NULL) { /* `n' key booting boots enet:bootp */
 -	       *ptr = 0;
@@ -159,10 +161,6 @@
 -	  } else
 -	       result->dev = strdup(ipath);
 -     else if ((ptr = strchr(ipath, ':')) != NULL) {
-+	  device_kind = prom_get_devtype(defdev);
-+     } else
-+	  device_kind = prom_get_devtype(ipath);
-+
 +     if (device_kind == FILE_DEVICE_NET) {
 +	  if (strchr(ipath, ':'))
 +	       result->file = netdev_path_to_filename(ipath);