Compile fix

[yaboot.git] / second / file.c

diff --git a/second/file.c b/second/file.c
index 8f86a6eaefb0b11e685ae5831bfd799617a59ba3..4054dd18ca24a3746990f3c19bc527a4ee7bfab7 100644 (file)
--- a/second/file.c
+++ b/second/file.c
@@ -36,7 +36,7 @@
 #include "errors.h"
 #include "debug.h"
 
-extern char bootdevice[1024];
+extern char bootdevice[];
 
 static char *netdev_path_to_filename(const char *path)
 {
@@ -147,7 +147,7 @@ static char *netdev_path_to_dev(const char *path)
 /* This function follows the device path in the devtree and separates
    the device name, partition number, and other datas (mostly file name)
    the string passed in parameters is changed since 0 are put in place
-   of some separators to terminate the various strings.  
+   of some separators to terminate the various strings.
 
    when a default device is supplied imagepath will be assumed to be a
    plain filename unless it contains a : otherwise if defaultdev is
@@ -177,7 +177,7 @@ parse_device_path(char *imagepath, char *defdevice, int defpart,
      char *ptr;
      char *ipath = NULL;
      char *defdev = NULL;
-     int device_kind;
+     int device_kind = -1;
 
      result->dev = NULL;
      result->part = -1;
@@ -185,16 +185,45 @@ parse_device_path(char *imagepath, char *defdevice, int defpart,
 
      if (!imagepath)
          return 0;
-     else if (!(ipath = strdup(imagepath))) 
+
+      /*
+       * Do preliminary checking for an iscsi device; it may appear as
+       * pure a network device (device_type == "network") if this is
+       * ISWI.  This is the case on IBM systems doing an iscsi OFW
+       * boot.
+       */
+     if (strstr(imagepath, TOK_ISCSI)) {
+         /*
+          * get the virtual device information from the
+          * "nas-bootdevice" property.
+          */
+         if (prom_get_chosen("nas-bootdevice", bootdevice, BOOTDEVSZ)) {
+              DEBUG_F("reset boot-device to"
+                      " /chosen/nas-bootdevice = %s\n", bootdevice);
+              device_kind = FILE_DEVICE_ISCSI;
+              ipath = strdup(bootdevice);
+              if (!ipath)
+                   return 0;
+         }
+         else
+              return 0;
+     }
+     else if (!(ipath = strdup(imagepath)))
          return 0;
 
      if (defdevice) {
          defdev = strdup(defdevice);
          device_kind = prom_get_devtype(defdev);
-     } else
+     } else if (device_kind == -1)
          device_kind = prom_get_devtype(ipath);
 
-     if (device_kind != FILE_DEVICE_NET && strchr(defdev, ':') != NULL) {
+     /*
+      * When an iscsi iqn is present, it may have embedded colons, so
+      * don't parse off anything.
+      */
+     if (device_kind != FILE_DEVICE_NET &&
+        device_kind != FILE_DEVICE_ISCSI &&
+        strchr(defdev, ':') != NULL) {
            if ((ptr = strrchr(defdev, ':')) != NULL)
                 *ptr = 0; /* remove trailing : from defdevice if necessary */
      }
@@ -202,7 +231,9 @@ parse_device_path(char *imagepath, char *defdevice, int defpart,
      /* This will not properly handle an obp-tftp argument list
       * with elements after the filename; that is handled below.
       */
-     if (device_kind != FILE_DEVICE_NET && strchr(ipath, ':') != NULL) {
+     if (device_kind != FILE_DEVICE_NET &&
+        device_kind != FILE_DEVICE_ISCSI &&
+        strchr(ipath, ':') != NULL) {
          if ((ptr = strrchr(ipath, ',')) != NULL) {
               char *colon = strrchr(ipath, ':');
               /* If a ':' occurs *after* a ',', then we assume that there is
@@ -223,13 +254,14 @@ parse_device_path(char *imagepath, char *defdevice, int defpart,
 
          if (!defdev)
               result->dev = netdev_path_to_dev(ipath);
-     } else if ((ptr = strchr(ipath, ':')) != NULL) {
+     } else if (device_kind != FILE_DEVICE_ISCSI &&
+               (ptr = strrchr(ipath, ':')) != NULL) {
          *ptr = 0;
          result->dev = strdup(ipath);
          if (*(ptr+1))
               result->part = simple_strtol(ptr+1, NULL, 10);
      } else if (!defdev) {
-         result->dev = strdup(ipath); 
+         result->dev = strdup(ipath);
      } else if (strlen(ipath)) {
           result->file = strdup(ipath);
      } else {
@@ -239,10 +271,10 @@ parse_device_path(char *imagepath, char *defdevice, int defpart,
 
      if (!result->dev && defdev)
          result->dev = strdup(defdev);
-     
+
      if (result->part < 0)
          result->part = defpart;
-     
+
      if (!result->file)
          result->file = strdup(deffile);
 
@@ -262,10 +294,10 @@ file_block_open(  struct boot_file_t*     file,
      struct partition_t*       parts;
      struct partition_t*       p;
      struct partition_t*       found;
-       
+
      parts = partitions_lookup(dev_name);
      found = NULL;
-                       
+
 #if DEBUG
      if (parts)
          prom_printf("partitions:\n");
@@ -289,7 +321,7 @@ file_block_open(    struct boot_file_t*     file,
 #if DEBUG
          if (found)
               prom_printf(" (match)\n");
-#endif                                         
+#endif
      }
 
      /* Note: we don't skip when found is NULL since we can, in some
@@ -351,7 +383,7 @@ static struct fs_t fs_default =
 int open_file(const struct boot_fspec_t* spec, struct boot_file_t* file)
 {
      int result;
-       
+
      memset(file, 0, sizeof(struct boot_file_t*));
      file->fs        = &fs_default;
 
@@ -363,7 +395,7 @@ int open_file(const struct boot_fspec_t* spec, struct boot_file_t* file)
          file->device_kind = result;
      else
          return result;
-       
+
      switch(file->device_kind) {
      case FILE_DEVICE_BLOCK:
          DEBUG_F("device is a block device\n");
@@ -375,7 +407,7 @@ int open_file(const struct boot_fspec_t* spec, struct boot_file_t* file)
      return 0;
 }
 
-/* 
+/*
  * Local variables:
  * c-file-style: "k&r"
  * c-basic-offset: 5