Re: [Patch] Robustly search for ZFS labels & uberblocks

[Richard Laager <rlaager@wiktel.com>]

[-- Attachment #1.1: Type: text/plain, Size: 68 bytes --]

Attached are two more patches to add to the stack.

-- 
Richard

[-- Attachment #1.2: zfs-on-linux-rlaager10.patch --]
[-- Type: text/x-patch, Size: 548 bytes --]

Index: grub/util/grub-probe.c
===================================================================
--- grub.orig/util/grub-probe.c	2012-02-02 03:36:38.827815635 -0600
+++ grub/util/grub-probe.c	2012-02-02 03:39:22.727085000 -0600
@@ -323,6 +323,11 @@
   if (path != NULL)
     {
       grub_path = canonicalize_file_name (path);
+      if (! grub_path)
+	{
+	  grub_util_error (_("failed to get canonical path of %s"), path);
+	  return;
+	}
       device_names = grub_guess_root_devices (grub_path);
       free (grub_path);
     }

[-- Attachment #1.3: zfs-on-linux-rlaager11.patch --]
[-- Type: text/x-patch, Size: 572 bytes --]

Index: grub/util/grub-probe.c
===================================================================
--- grub.orig/util/grub-probe.c	2012-02-02 04:04:16.154167324 -0600
+++ grub/util/grub-probe.c	2012-02-02 04:07:11.916090000 -0600
@@ -363,6 +363,16 @@
     }
   *curdrive = 0;
 
+  if (print == PRINT_DRIVE)
+    {
+      for (curdrive = drives_names; *curdrive; curdrive++)
+	{
+	  printf ("(%s)", *curdrive);
+	  putchar (delim);
+	}
+      return;
+    }
+
   if (print == PRINT_FS || print == PRINT_FS_UUID
       || print == PRINT_FS_LABEL)
     {

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]