From: Tony Breeds <tony@bakeyournoodle.com>
Date: Wed, 19 Oct 2011 02:36:49 +0000 (+1100)
Subject: fs_swap: Reduce severity of not finding a partition table on boot device.
X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=commitdiff_plain;h=57ec85144e2a06f60b6581ef3013bc9d627397eb;hp=caa5b9fc39eab729963d70d9910b6319a866fae4

fs_swap: Reduce severity of not finding a partition table on boot device.

When booted from a cdrom the fs_swap would exit with FILE_ERR_BADDEV,
this causes fs_open to abort too early.

We don't need to check file->device_kind != FILE_DEVICE_BLOCK as we're
only called when that is true.

Demote the return value to FILE_ERR_BAD_FSYS which allows fs_open to
look for other filesystems on the device.

Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
---

diff --git a/second/fs_swap.c b/second/fs_swap.c
index 87da877..1efb96e 100644
--- a/second/fs_swap.c
+++ b/second/fs_swap.c
@@ -59,9 +59,10 @@ swap_open(struct boot_file_t* file, struct partition_t* part,
      DEBUG_ENTER;
      DEBUG_OPEN;
 
-     if (file->device_kind != FILE_DEVICE_BLOCK || part == NULL) {
-	  DEBUG_LEAVE(FILE_ERR_BADDEV);
-	  return FILE_ERR_BADDEV;
+     if (part == NULL) {
+          DEBUG_F("No partions on %s, not checking for swap\n", device_name);
+	  DEBUG_LEAVE(FILE_ERR_BAD_FSYS);
+	  return FILE_ERR_BAD_FSYS;
      }
 
      /* We assume that device is "short" and is correctly NULL terminsated */