[parisc-linux-cvs] palo bame
Paul Bame
bame@puffin.external.hp.com
Tue, 13 Mar 2001 17:39:28 -0700
CVSROOT: /home/cvs/parisc
Module name: palo
Changes by: bame 01/03/13 17:39:28
Modified files:
ipl : ipl.c
Log message:
Tested the wrong fix -- this should work better...
Index: ipl/ipl.c
===================================================================
RCS file: /home/cvs/parisc/palo/ipl/ipl.c,v
retrieving revision 1.14
diff -u -r1.14 ipl.c
--- ipl.c 2001/03/13 18:53:15 1.14
+++ ipl.c 2001/03/14 00:38:45
@@ -93,12 +93,15 @@
strcpy(lcmd, suffix1);
/* see if we have a ramdisk */
- if ((strncmp(suffix1, "initrd=", 7) == 0, suffix2 = suffix1) ||
- (suffix2 = strstr(suffix1, " initrd=")) != NULL)
+ suffix2 = suffix1;
+ if ((strncmp(suffix1, "initrd=", 7) == 0) ||
+ (suffix2 = strstr(suffix1, " initrd=")) != NULL)
{
char *suffix3;
lcmd[suffix2 - suffix1] = '\0';
- suffix3 = parse_pfname(suffix2 + 8, rdpart, rdname);
+ if (*suffix2 == ' ')
+ suffix2++;
+ suffix3 = parse_pfname(suffix2 + 7, rdpart, rdname);
strcat(lcmd, suffix3);
}
@@ -288,7 +291,6 @@
memset(&partition, 0, sizeof partition);
partitioned = load_partitions(bootdev,
partition, sizeof partition / sizeof partition[0]);
-
if (partitioned)
print_ptab(partition, sizeof partition / sizeof partition[0]);