Add raid5rec and raid6rec to grub-probe and grub-setup
PATCH 1/1 Add raid5rec and raid6rec to grub-probe and grub-setup
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 <[email protected]>
* 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'
common.rmk +2 -1
@@ -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'
i386-pc.rmk +2 -1
@@ -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'
sparc64-ieee1275.rmk +2 -1
@@ -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,
Signature · 1 line
Colin Watson [[email protected]]
Quoted 6 lines · 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.)
Quoted 7 lines
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.
Go ahead for mainline
Quoted 52 lines
2010-07-06 Colin Watson <[email protected]>
* conf/common.rmk (
grub_probe_SOURCES): Adddisk/raid5_recover.canddisk/raid6_recover.c.
* conf/i386-pc.rmk (grub_setup_SOURCES): Likewise.
* conf/sparc64-ieee1275.rmk (grub_setup_SOURCES): Likewise.=== modified file 'conf/common.rmk'
common.rmk +2
-1@@ -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'
i386-pc.rmk +2
-1@@ -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'
sparc64-ieee1275.rmk +2
-1@@ -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,
Signature · 2 lines
Regards Vladimir 'φ-coder/phcoder' Serbinenko