Parse the subnetmask from bootpath and DHCP options

[yaboot.git] / second / fs_of.c

diff --git a/second/fs_of.c b/second/fs_of.c
index f6bf50f334b9a04ab5f639707b589ea0ffcfb5e8..17a4df3517bea60a6dbe45500df6e3610d38f7f2 100644 (file)
--- a/second/fs_of.c
+++ b/second/fs_of.c
@@ -137,6 +137,7 @@ of_net_open(struct boot_file_t* file,
      static char       buffer[1024];
      char               *filename = NULL;
      char               *p;
      static char       buffer[1024];
      char               *filename = NULL;
      char               *p;

+     int                new_tftp;

 
      DEBUG_ENTER;
      DEBUG_OPEN;
 
      DEBUG_ENTER;
      DEBUG_OPEN;


@@ -154,24 +155,33 @@ of_net_open(struct boot_file_t* file,
      /* If we didn't get a ':' include one */
      if (fspec->dev[strlen(fspec->dev)-1] != ':')
           strcat(buffer, ":");
      /* If we didn't get a ':' include one */
      if (fspec->dev[strlen(fspec->dev)-1] != ':')
           strcat(buffer, ":");

-     strcat(buffer, fspec->siaddr);
-     strcat(buffer, ",");
-     strcat(buffer, filename);
-     strcat(buffer, ",");
-     strcat(buffer, fspec->ciaddr);
-     strcat(buffer, ",");
-     strcat(buffer, fspec->giaddr);
-
-     /* If /packages/cas exists the we have a "new skool" tftp */
-     if (prom_finddevice("/packages/cas") != PROM_INVALID_HANDLE) {
+
+     /* If /packages/cas exists the we have a "new skool" tftp.
+      * This means that siaddr is the tftp server and that we can add
+      * {tftp,bootp}_retrys, subnet mask and tftp block size to the load
+      * method */
+     new_tftp = (prom_finddevice("/packages/cas") != PROM_INVALID_HANDLE);
+     DEBUG_F("Using %s tftp style\n", (new_tftp? "new": "old"));
+
+     if (new_tftp) {
+          strcat(buffer, fspec->siaddr);
+          strcat(buffer, ",");
+          strcat(buffer, filename);
+          strcat(buffer, ",");
+          strcat(buffer, fspec->ciaddr);
+          strcat(buffer, ",");
+          strcat(buffer, fspec->giaddr);

           strcat(buffer, ",");
           strcat(buffer, fspec->bootp_retries);
           strcat(buffer, ",");
           strcat(buffer, fspec->tftp_retries);
           strcat(buffer, ",");
           strcat(buffer, ",");
           strcat(buffer, fspec->bootp_retries);
           strcat(buffer, ",");
           strcat(buffer, fspec->tftp_retries);
           strcat(buffer, ",");

+          strcat(buffer, fspec->subnetmask);
+          strcat(buffer, ",");

           strcat(buffer, fspec->addl_params);
      } else {
           strcat(buffer, fspec->addl_params);
      } else {

-          DEBUG_F("No \"/packages/cas\" using simple args\n")
+          strcat(buffer, ",");
+          strcat(buffer, filename);

      }
 
      DEBUG_F("Opening: \"%s\"\n", buffer);
      }
 
      DEBUG_F("Opening: \"%s\"\n", buffer);