X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F45-grub-images;h=6dfbf58eeeb79a9c2157e027d0f1da2424c00a49;hb=308d87b0f5b576962756484d50e8bd11b680bfb0;hp=ff72e31f6b5a27c5ae930368b17656dc2b32e2c3;hpb=2cb96071f5bc844fdd0265272f9a6252418920c5;p=grml-live.git diff --git a/etc/grml/fai/config/scripts/GRMLBASE/45-grub-images b/etc/grml/fai/config/scripts/GRMLBASE/45-grub-images index ff72e31..6dfbf58 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/45-grub-images +++ b/etc/grml/fai/config/scripts/GRMLBASE/45-grub-images @@ -44,6 +44,18 @@ if ifclass AMD64 ; then fi fi +# until grub 1.99-27.1 it's called raid, starting with +# grub version 2.00-14 the raid.mod module no longer exists +if [ -r "${target}"/usr/lib/grub/i386-pc/raid.mod ] ; then + echo "Using raid module as file raid.mod is present" + ADDITIONAL_MODULES[raid]="raid" +elif [ -r "${target}"/usr/lib/grub/i386-pc/diskfilter.mod ] ; then + echo "Using diskfilter and related modules as file diskfilter.mod is present" + ADDITIONAL_MODULES[raid]="diskfilter mdraid09 mdraid09_be mdraid1x raid5rec raid6rec" +else + echo "Warning: no according raid module in grub directory found." +fi + BOOTX64="${BOOTX64##${target}}" EFI_IMG="${EFI_IMG##${target}}" TMP_CONFIG="${TMP_CONFIG##${target}}" @@ -53,8 +65,9 @@ $ROOTCMD grub-mkimage -O $arch -o /boot/$arch.img --prefix=/boot/grub/ --config= bitmap boot btrfs cat chain cmp configfile cpio echo elf ext2 \ fat gfxmenu gfxterm gzio help iso9660 jpeg linux loopback lvm \ memdisk minicmd multiboot normal part_gpt part_msdos play png \ - probe raid regexp reiserfs search search_fs_file search_fs_uuid \ - search_label squash4 terminal test video videoinfo xfs ${ADDITIONAL_MODULES[$arch]} + probe regexp reiserfs search search_fs_file search_fs_uuid \ + search_label squash4 terminal test video videoinfo xfs \ + ${ADDITIONAL_MODULES[raid]} ${ADDITIONAL_MODULES[$arch]} done if [ -f "${target}/boot/i386-pc.img" ] ; then