|
 |
f96e0b |
From e5947ad0f47058715a588ff2fdfa5487f65f459b Mon Sep 17 00:00:00 2001
|
|
|
f96e0b |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
Date: Sun, 28 Apr 2013 13:54:32 +0200
|
|
|
f96e0b |
Subject: [PATCH 375/482] * grub-core/commands/probe.c: Add missing
|
|
|
f96e0b |
grub_device_close.
|
|
|
f96e0b |
|
|
|
f96e0b |
---
|
|
|
f96e0b |
ChangeLog | 4 ++++
|
|
|
f96e0b |
grub-core/commands/probe.c | 6 ++++++
|
|
|
f96e0b |
2 files changed, 10 insertions(+)
|
|
|
f96e0b |
|
|
|
f96e0b |
diff --git a/ChangeLog b/ChangeLog
|
|
|
f96e0b |
index 21260c0..5c50b56 100644
|
|
|
f96e0b |
--- a/ChangeLog
|
|
|
f96e0b |
+++ b/ChangeLog
|
|
|
f96e0b |
@@ -1,5 +1,9 @@
|
|
|
f96e0b |
2013-04-28 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
|
|
|
f96e0b |
+ * grub-core/commands/probe.c: Add missing grub_device_close.
|
|
|
f96e0b |
+
|
|
|
f96e0b |
+2013-04-28 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
+
|
|
|
f96e0b |
* INSTALL: Document linguas.sh.
|
|
|
f96e0b |
|
|
|
f96e0b |
2013-04-28 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
diff --git a/grub-core/commands/probe.c b/grub-core/commands/probe.c
|
|
|
f96e0b |
index eeece87..cf2793e 100644
|
|
|
f96e0b |
--- a/grub-core/commands/probe.c
|
|
|
f96e0b |
+++ b/grub-core/commands/probe.c
|
|
|
f96e0b |
@@ -83,6 +83,7 @@ grub_cmd_probe (grub_extcmd_context_t ctxt, int argc, char **args)
|
|
|
f96e0b |
grub_env_set (state[0].arg, val);
|
|
|
f96e0b |
else
|
|
|
f96e0b |
grub_printf ("%s", val);
|
|
|
f96e0b |
+ grub_device_close (dev);
|
|
|
f96e0b |
return GRUB_ERR_NONE;
|
|
|
f96e0b |
}
|
|
|
f96e0b |
if (state[2].set)
|
|
|
f96e0b |
@@ -94,6 +95,7 @@ grub_cmd_probe (grub_extcmd_context_t ctxt, int argc, char **args)
|
|
|
f96e0b |
grub_env_set (state[0].arg, val);
|
|
|
f96e0b |
else
|
|
|
f96e0b |
grub_printf ("%s", val);
|
|
|
f96e0b |
+ grub_device_close (dev);
|
|
|
f96e0b |
return GRUB_ERR_NONE;
|
|
|
f96e0b |
}
|
|
|
f96e0b |
fs = grub_fs_probe (dev);
|
|
|
f96e0b |
@@ -105,6 +107,7 @@ grub_cmd_probe (grub_extcmd_context_t ctxt, int argc, char **args)
|
|
|
f96e0b |
grub_env_set (state[0].arg, fs->name);
|
|
|
f96e0b |
else
|
|
|
f96e0b |
grub_printf ("%s", fs->name);
|
|
|
f96e0b |
+ grub_device_close (dev);
|
|
|
f96e0b |
return GRUB_ERR_NONE;
|
|
|
f96e0b |
}
|
|
|
f96e0b |
if (state[4].set)
|
|
|
f96e0b |
@@ -125,6 +128,7 @@ grub_cmd_probe (grub_extcmd_context_t ctxt, int argc, char **args)
|
|
|
f96e0b |
else
|
|
|
f96e0b |
grub_printf ("%s", uuid);
|
|
|
f96e0b |
grub_free (uuid);
|
|
|
f96e0b |
+ grub_device_close (dev);
|
|
|
f96e0b |
return GRUB_ERR_NONE;
|
|
|
f96e0b |
}
|
|
|
f96e0b |
if (state[5].set)
|
|
|
f96e0b |
@@ -147,8 +151,10 @@ grub_cmd_probe (grub_extcmd_context_t ctxt, int argc, char **args)
|
|
|
f96e0b |
else
|
|
|
f96e0b |
grub_printf ("%s", label);
|
|
|
f96e0b |
grub_free (label);
|
|
|
f96e0b |
+ grub_device_close (dev);
|
|
|
f96e0b |
return GRUB_ERR_NONE;
|
|
|
f96e0b |
}
|
|
|
f96e0b |
+ grub_device_close (dev);
|
|
|
f96e0b |
return grub_error (GRUB_ERR_BAD_ARGUMENT, "unrecognised target");
|
|
|
f96e0b |
}
|
|
|
f96e0b |
|
|
|
f96e0b |
--
|
|
|
f96e0b |
1.8.2.1
|
|
|
f96e0b |
|