|
 |
a5bd9f6 |
From 08a1459a9534fa2337744a32dda511d496e9d6cf Mon Sep 17 00:00:00 2001
|
|
|
a5bd9f6 |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
Date: Mon, 10 Dec 2012 19:15:51 +0100
|
|
|
a5bd9f6 |
Subject: [PATCH 066/364] * grub-core/disk/cryptodisk.c
|
|
|
a5bd9f6 |
(grub_cmd_cryptomount): Strip brackets around device name if
|
|
|
a5bd9f6 |
necessarry.
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
---
|
|
|
a5bd9f6 |
ChangeLog | 5 +++++
|
|
|
a5bd9f6 |
grub-core/disk/cryptodisk.c | 12 +++++++++++-
|
|
|
a5bd9f6 |
2 files changed, 16 insertions(+), 1 deletion(-)
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
diff --git a/ChangeLog b/ChangeLog
|
|
|
a5bd9f6 |
index e522078..8d7d988 100644
|
|
|
a5bd9f6 |
--- a/ChangeLog
|
|
|
a5bd9f6 |
+++ b/ChangeLog
|
|
|
a5bd9f6 |
@@ -1,3 +1,8 @@
|
|
|
a5bd9f6 |
+2012-12-10 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
+ * grub-core/disk/cryptodisk.c (grub_cmd_cryptomount): Strip brackets
|
|
|
a5bd9f6 |
+ around device name if necessarry.
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
2012-12-10 Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
* util/grub-install.in: Follow the symbolic link parameter added
|
|
|
a5bd9f6 |
diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
|
|
|
a5bd9f6 |
index 1ac906d..3de3b86 100644
|
|
|
a5bd9f6 |
--- a/grub-core/disk/cryptodisk.c
|
|
|
a5bd9f6 |
+++ b/grub-core/disk/cryptodisk.c
|
|
|
a5bd9f6 |
@@ -928,10 +928,20 @@ grub_cmd_cryptomount (grub_extcmd_context_t ctxt, int argc, char **args)
|
|
|
a5bd9f6 |
grub_err_t err;
|
|
|
a5bd9f6 |
grub_disk_t disk;
|
|
|
a5bd9f6 |
grub_cryptodisk_t dev;
|
|
|
a5bd9f6 |
+ char *devname;
|
|
|
a5bd9f6 |
+ char *devlast;
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
search_uuid = NULL;
|
|
|
a5bd9f6 |
check_boot = state[2].set;
|
|
|
a5bd9f6 |
- disk = grub_disk_open (args[0]);
|
|
|
a5bd9f6 |
+ devname = args[0];
|
|
|
a5bd9f6 |
+ if (devname[0] == '(' && *(devlast = &devname[grub_strlen (devname) - 1]) == ')')
|
|
|
a5bd9f6 |
+ {
|
|
|
a5bd9f6 |
+ *devlast = '\0';
|
|
|
a5bd9f6 |
+ disk = grub_disk_open (devname + 1);
|
|
|
a5bd9f6 |
+ *devlast = ')';
|
|
|
a5bd9f6 |
+ }
|
|
|
a5bd9f6 |
+ else
|
|
|
a5bd9f6 |
+ disk = grub_disk_open (devname);
|
|
|
a5bd9f6 |
if (!disk)
|
|
|
a5bd9f6 |
return grub_errno;
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
--
|
|
|
a5bd9f6 |
1.8.1.4
|
|
|
a5bd9f6 |
|