* grub-core/disk/cryptodisk.c (grub_cmd_cryptomount): Strip brackets

	around device name if necessarry.

diff --git a/ChangeLog b/ChangeLog
index e5220788dc4f44ab4b3401e488875661b4346bf8..8d7d988b97d6080625a17a52311d9abeb6c0ec34 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/disk/cryptodisk.c (grub_cmd_cryptomount): Strip brackets
+       around device name if necessarry.
+
 2012-12-10  Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 
        * util/grub-install.in: Follow the symbolic link parameter added

diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
index 1ac906d90eade409d5d649a1bd3d1f7b3e707769..3de3b8668ea26236c77f88407c31b83284ff268b 100644 (file)
--- a/grub-core/disk/cryptodisk.c
+++ b/grub-core/disk/cryptodisk.c
@@ -928,10 +928,20 @@ grub_cmd_cryptomount (grub_extcmd_context_t ctxt, int argc, char **args)
       grub_err_t err;
       grub_disk_t disk;
       grub_cryptodisk_t dev;
+      char *devname;
+      char *devlast;
 
       search_uuid = NULL;
       check_boot = state[2].set;
-      disk = grub_disk_open (args[0]);
+      devname = args[0];
+      if (devname[0] == '(' && *(devlast = &devname[grub_strlen (devname) - 1]) == ')')
+       {
+         *devlast = '\0';
+         disk = grub_disk_open (devname + 1);
+         *devlast = ')';
+       }
+      else
+       disk = grub_disk_open (devname);
       if (!disk)
        return grub_errno;