[PATCH 3/3] PReP FAT support

Leonardo Rangel lrangel at linux.vnet.ibm.com
Fri Nov 9 04:59:40 EST 2007


At last, we remove code that is no longer necessary (mostly, code that  
was used to build config filename dinamically, depending on machine  
type)
Index: yaboot/second/yaboot.c
===================================================================
--- yaboot.orig/second/yaboot.c 2007-11-08 12:12:05.000000000 -0200
+++ yaboot/second/yaboot.c  2007-11-08 12:15:55.000000000 -0200
@@ -55,7 +55,6 @@
  #include "bootinfo.h"
  #include "debug.h"

-#define CONFIG_FILE_NAME   "yaboot.conf"
  #define CONFIG_FILE_MAX        0x8000      /* 32k */

  #ifdef USE_MD5_PASSWORDS
@@ -973,10 +972,7 @@
                   prom_printf("partition: auto\n");
               else
                   prom_printf("partition: %d\n", boot.part);
-             if (strlen(boot.file))
-                 prom_printf("file: %s\n", boot.file);
-             else
-                 prom_printf("file: /etc/%s\n",CONFIG_FILE_NAME);
+             prom_printf("file: %s\n", boot.file);
           }

           imagename = "\0";
@@ -1702,7 +1698,6 @@
  {
       char *ptype;
       int conf_given = 0;
-     char conf_path[1024];

       if (_machine == _MACH_Pmac)
       setup_display();
@@ -1757,35 +1752,6 @@
       DEBUG_F("After parse_device_path: dev=%s, part=%d, file=%s\n",
          boot.dev, boot.part, boot.file);

-     if (!conf_given) {
-         if (_machine == _MACH_chrp)
-             boot.file = "/etc/";
-         else if (strlen(boot.file)) {
-             if (!strncmp(boot.file, "\\\\", 2))
-                 boot.file = "\\\\";
-             else {
-                 char *p, *last;
-                 p = last = boot.file;
-                 while(*p) {
-                     if (*p == '\\')
-                         last = p;
-                     p++;
-                 }
-                 if (p)
-                     *(last) = 0;
-                 else
-                     boot.file = "";
-                 if (strlen(boot.file))
-                     strcat(boot.file, "\\");
-             }
-         }
-         strcpy(conf_path, boot.file);
-         strcat(conf_path, CONFIG_FILE_NAME);
-         boot.file = conf_path;
-         DEBUG_F("After path kludgeup: dev=%s, part=%d, file=%s\n",
-            boot.dev, boot.part, boot.file);
-     }
-
       /*
        * If we're doing a netboot, first look for one which matches our
        * MAC or IP addresses.






More information about the Yaboot-devel mailing list