[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

yaboot-1.3.3-patch repost. No need for DHCP and TFTP on same box.



I missed one of the files late last night.

A minor thing, but enough to stop it from working.

So here is a new posting.
Hope someone else gets some use out of this, and that it
doesn't break anything else.

Peter
Only in yaboot-1.3.3/second: .yaboot.c.swp
Only in yaboot-1.3.3/second: cscope.out
diff -rU3 yaboot-1.3.3/second/file.c yaboot-1.3.3-b4/second/file.c
--- yaboot-1.3.3/second/file.c	Tue Oct  2 01:49:18 2001
+++ yaboot-1.3.3-b4/second/file.c	Thu Sep 20 15:15:31 2001
@@ -44,13 +44,13 @@
 		*partition = -1;
 
 	p = strchr(of_device, ':');
-	if (!p) return of_device;   /* if null terminated we are finished */
+	if (p)
+		*p = 0;
+	else
+		return of_device;
 	
-	else if (strstr(of_device, "ethernet")) p = strchr(of_device, ','); /* skip over ip all the way to the ',' */
-	*p = 0;
-
-	last = ++p;	/* sets to start of second part */
-	while(*p && *p != ',') { 
+	last = ++p;
+	while(*p && *p != ',') {
         if (!isdigit (*p)) {
 			p = last;
 			break;
@@ -64,7 +64,7 @@
 	}
 	if (*p && file_spec)
 		*file_spec = p;
-
+		
 	return of_device;
 
 }
diff -rU3 yaboot-1.3.3/second/fs_of.c yaboot-1.3.3-b4/second/fs_of.c
--- yaboot-1.3.3/second/fs_of.c	Mon Oct  1 23:32:25 2001
+++ yaboot-1.3.3-b4/second/fs_of.c	Thu Sep 20 15:15:31 2001
@@ -137,8 +137,7 @@
         DEBUG_OPEN;
 
 	strncpy(buffer, dev_name, 1000);
-/*	strcat(buffer, ":130.60.61.34"); */
-/*	strcat(buffer, ":0"); */
+	strcat(buffer, ":0");
 	if (file_name && strlen(file_name)) {
 		strcat(buffer, ",");
 		strcat(buffer, file_name);
Only in yaboot-1.3.3/second: fuckit

Reply to: