|
 |
a5bd9f6 |
From 9196249442d3d9b360b77a5bd35ffb6c49935c78 Mon Sep 17 00:00:00 2001
|
|
|
a5bd9f6 |
From: Colin Watson <cjwatson@ubuntu.com>
|
|
|
a5bd9f6 |
Date: Wed, 26 Sep 2012 13:12:20 +0100
|
|
|
a5bd9f6 |
Subject: [PATCH 048/364] * util/grub-mkconfig_lib.in
|
|
|
a5bd9f6 |
(is_path_readable_by_grub): Redirect errors from grub-probe to /dev/null, not
|
|
|
a5bd9f6 |
stdout.
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
---
|
|
|
a5bd9f6 |
ChangeLog | 5 +++++
|
|
|
a5bd9f6 |
util/grub-mkconfig_lib.in | 2 +-
|
|
|
a5bd9f6 |
2 files changed, 6 insertions(+), 1 deletion(-)
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
diff --git a/ChangeLog b/ChangeLog
|
|
|
a5bd9f6 |
index d81a9a6..c43f8a4 100644
|
|
|
a5bd9f6 |
--- a/ChangeLog
|
|
|
a5bd9f6 |
+++ b/ChangeLog
|
|
|
a5bd9f6 |
@@ -1,3 +1,8 @@
|
|
|
a5bd9f6 |
+2012-09-26 Colin Watson <cjwatson@ubuntu.com>
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
+ * util/grub-mkconfig_lib.in (is_path_readable_by_grub): Redirect
|
|
|
a5bd9f6 |
+ errors from grub-probe to /dev/null, not stdout.
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
2012-09-26 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
* grub-core/fs/affs.c (grub_affs_mount): Support AFFS bootblock in
|
|
|
a5bd9f6 |
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
|
|
|
a5bd9f6 |
index 8f21eb2..3574839 100644
|
|
|
a5bd9f6 |
--- a/util/grub-mkconfig_lib.in
|
|
|
a5bd9f6 |
+++ b/util/grub-mkconfig_lib.in
|
|
|
a5bd9f6 |
@@ -65,7 +65,7 @@ is_path_readable_by_grub ()
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
# ... or if we can't figure out the abstraction module, for example if
|
|
|
a5bd9f6 |
# memberlist fails on an LVM volume group.
|
|
|
a5bd9f6 |
- if abstractions="`"${grub_probe}" -t abstraction "$path"`" 2>&1 ; then
|
|
|
a5bd9f6 |
+ if abstractions="`"${grub_probe}" -t abstraction "$path"`" 2> /dev/null ; then
|
|
|
a5bd9f6 |
:
|
|
|
a5bd9f6 |
else
|
|
|
a5bd9f6 |
return 1
|
|
|
a5bd9f6 |
--
|
|
|
a5bd9f6 |
1.8.1.4
|
|
|
a5bd9f6 |
|