[PATCH] Add raid5rec and raid6rec to grub-probe and grub-setup

[Colin Watson]

Martin F. Krafft showed up on IRC with a problem that turned out to be
mainly due to running on a degraded RAID array, which grub-probe and
grub-setup were unable to handle because they didn't have the necessary
modules built in.  (He has some other problem after that which I haven't
yet managed to track down.)

Is there any reason not to include RAID recovery support in grub-probe
and grub-setup?  It's already in grub-fstest, including it at least
makes GRUB installable for Martin, and I don't see any commits that
explicitly removed this support at any point so there doesn't seem to be
any particular reason they aren't included.

2010-07-06  Colin Watson  <address@hidden>

        * conf/common.rmk (grub_probe_SOURCES): Add disk/raid5_recover.c
        and disk/raid6_recover.c.
        * conf/i386-pc.rmk (grub_setup_SOURCES): Likewise.
        * conf/sparc64-ieee1275.rmk (grub_setup_SOURCES): Likewise.

=== modified file 'conf/common.rmk'
--- conf/common.rmk     2010-07-02 17:35:07 +0000
+++ conf/common.rmk     2010-07-06 14:03:50 +0000
@@ -38,7 +38,8 @@ grub_probe_SOURCES = gnulib/progname.c u
        partmap/msdos.c partmap/bsdlabel.c partmap/apple.c \
        partmap/sun.c partmap/sunpc.c partmap/gpt.c \
        kern/fs.c kern/env.c fs/fshelp.c                        \
-       disk/raid.c disk/mdraid_linux.c disk/lvm.c grub_probe_init.c
+       disk/raid.c disk/raid5_recover.c disk/raid6_recover.c   \
+       disk/mdraid_linux.c disk/lvm.c grub_probe_init.c
 
 ifeq ($(enable_grub_fstest), yes)
 bin_UTILITIES += grub-fstest

=== modified file 'conf/i386-pc.rmk'
--- conf/i386-pc.rmk    2010-06-12 11:17:28 +0000
+++ conf/i386-pc.rmk    2010-07-06 14:04:13 +0000
@@ -78,7 +78,8 @@ grub_setup_SOURCES = gnulib/progname.c u
        partmap/msdos.c partmap/bsdlabel.c partmap/sunpc.c              \
        partmap/gpt.c                                                   \
                                                                        \
-       disk/raid.c disk/mdraid_linux.c disk/lvm.c                      \
+       disk/raid.c disk/raid5_recover.c disk/raid6_recover.c           \
+       disk/mdraid_linux.c disk/lvm.c                                  \
        util/raid.c util/lvm.c                                          \
        grub_setup_init.c
 

=== modified file 'conf/sparc64-ieee1275.rmk'
--- conf/sparc64-ieee1275.rmk   2010-07-02 17:35:07 +0000
+++ conf/sparc64-ieee1275.rmk   2010-07-06 14:04:29 +0000
@@ -62,7 +62,8 @@ grub_setup_SOURCES = util/sparc64/ieee12
        partmap/amiga.c partmap/apple.c partmap/msdos.c                 \
        partmap/bsdlabel.c partmap/sun.c partmap/acorn.c                \
                                                                        \
-       disk/raid.c disk/mdraid_linux.c disk/lvm.c util/raid.c          \
+       disk/raid.c disk/raid5_recover.c disk/raid6_recover.c           \
+       disk/mdraid_linux.c disk/lvm.c util/raid.c                      \
        util/lvm.c gnulib/progname.c grub_setup_init.c
 
 # For grub-ofpathname.

Thanks,

-- 
Colin Watson                                       address@hidden