Author: sparky
Date: Mon Mar 6 10:38:35 2006
New Revision: 7103
Modified:
ppcrcd/trunk/yaboot/yaboot.c
Log:
- rename yaboot.conf -> yaboot.cfg (OF only understands 8.3 names on FAT
partition)
- don't warn about incorrect bootstrap partition when it's FAT
Modified: ppcrcd/trunk/yaboot/yaboot.c
==============================================================================
--- ppcrcd/trunk/yaboot/yaboot.c (original)
+++ ppcrcd/trunk/yaboot/yaboot.c Mon Mar 6 10:38:35 2006
@@ -56,7 +56,7 @@
#include "debug.h"
#include "gunzip.h"
-#define CONFIG_FILE_NAME "yaboot.conf"
+#define CONFIG_FILE_NAME "yaboot.cfg"
#define CONFIG_FILE_MAX 0x8000 /* 32k */
#ifdef USE_MD5_PASSWORDS
@@ -783,7 +783,7 @@
"Note that the comma (,) is only required if you specify an
OpenFirmware\n"
"device, if you only specify a filename you should not start it
with a \",\"\n\n"
"If you omit \"device:\" and \"partno\" yaboot will use the
values of \n"
- "\"device=\" and \"partition=\" in yaboot.conf, right now those
are set to: \n"
+ "\"device=\" and \"partition=\" in " CONFIG_FILE_NAME ", right
now those are set to: \n"
"device=%s\n"
"partition=%d\n\n", defdevice, defpart);
return 0;
@@ -1723,7 +1723,7 @@
"_NOT_send_mail_when_booting_breaks");
if (warn) {
ptype = get_part_type(boot.dev, boot.part);
- if ((ptype != NULL) && (strcmp(ptype,
"Apple_Bootstrap")))
+ if ((ptype != NULL) && (strcmp(ptype,
"Apple_Bootstrap")) && (strcmp(ptype, "Fat")))
prom_printf("\nWARNING: Bootstrap partition
type is wrong:"
" \"%s\"\n"
" type should be:
\"Apple_Bootstrap\"\n\n", ptype);
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
