On Mon, Jun 07, 2010 at 10:57:27PM +0200, Vladimir 'φ-coder/phcoder' Serbinenko
wrote:
> On 06/03/2010 06:23 PM, Colin Watson wrote:
> > Following the merge of my dmraid-probe branch, several people have
> > reported extremely verbose error output in the event that the kernel
> > doesn't have device-mapper support (perhaps because the module isn't
> > loaded; it's modular in the stock Debian kernel). See e.g.
> > http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=584196. The attached
> > patch fixes this. OK for trunk?
>
> Go ahead.
Thanks, done.
> > (The long patch to util/deviceiter.c is almost entirely due to the extra
> > 'if' causing an indentation change.)
>
> For such cases please send a patch with --diff-options=-bpB
Sorry about that. The relevant file from the patch with those options
follows, for the record.
=== modified file 'util/deviceiter.c'
--- util/deviceiter.c 2010-01-26 14:26:16 +0000
+++ util/deviceiter.c 2010-06-03 16:00:06 +0000
@@ -33,6 +33,7 @@
#include <grub/util/deviceiter.h>
#include <grub/list.h>
#include <grub/misc.h>
+#include <grub/emu/misc.h>
#ifdef __linux__
# if !defined(__GLIBC__) || \
@@ -676,6 +677,7 @@ grub_util_iterate_devices (int NESTED_FU
}
/* DM-RAID. */
+ if (grub_device_mapper_supported ())
{
struct dm_tree *tree = NULL;
struct dm_task *task = NULL;
--
Colin Watson [cjwat...@ubuntu.com]
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/grub-devel
