grub-assemble: Use single list of modules

3 files changed, 204 insertions, 10 deletions

diff --git a/resources/utilities/grub-assemble/gen.txtmode.sh b/resources/utilities/grub-assemble/gen.txtmode.sh
index d9e69f8..1906f77 100755
--- a/resources/utilities/grub-assemble/gen.txtmode.sh
+++ b/resources/utilities/grub-assemble/gen.txtmode.sh
@@ -11,11 +11,7 @@ set -u -e -v
 # This is where GRUB is expected to be (outside of the grub-assemble, instead in main checkout)
 grubdir="../../../grub"
 
-# Install modules (installed, but not automatically loaded)
-grub_install_modules="adler32 all_video archelp ata backtrace bitmap bitmap_scale cmp cpio_be cpio cpuid crc64 cs5536 div_test efiemu elf eval exfat extcmd file fshelp gettext gfxmenu gptsync gzio hashsum hexdump http linux16 loadenv lzopio mda_text mmap mpi msdospart multiboot2 multiboot nativedisk net newc ntfscomp ntfs odc offsetio parttool priority_queue procfs progress read relocator scsi search_fs_file search_fs_uuid search_label search setjmp setpci sleep squash4 tar terminfo testload testspeed tftp time trig tr true udf ufs1_be ufs1 ufs2 usbserial_common usbserial_ftdi usbserial_pl2303 usbserial_usbdebug usbtest video_colors videotest_checksum xzio"
-
-# Modules (and always loaded)
-grub_modules="acpi ahci at_keyboard boot cat cbfs cbls cbtime chain cmosdump cmostest cbmemc crypto cryptodisk configfile datehook date datetime diskfilter disk echo ext2 ehci fat halt help iorw iso9660 keystatus linux loopback ls lsacpi lsmmap lspci luks lvm memdisk minicmd memrw morse normal ohci part_gpt part_msdos password password_pbkdf2 pbkdf2 pcidump pci play probe reboot serial terminal test usb_keyboard usbms uhci gcry_arcfour gcry_blowfish gcry_camellia gcry_cast5 gcry_crc gcry_des gcry_dsa gcry_idea gcry_md4 gcry_md5 gcry_rfc2268 gcry_rijndael gcry_rmd160 gcry_rsa gcry_seed gcry_serpent gcry_sha1 gcry_sha256 gcry_sha512 gcry_tiger gcry_twofish gcry_whirlpool hdparm regexp spkmodem syslinuxcfg usb verify videoinfo videotest xfs btrfs zfs sfs romfs reiserfs nilfs2 minix_be minix3_be minix3 minix2_be minix2 minix jfs hfsplus hfs bfs afs affs gfxmenu gfxterm_background gfxterm_menu jpeg png tga pata"
+source "modules.conf"
 
 # Generate the grub.elf
 $grubdir/grub-mkstandalone \
diff --git a/resources/utilities/grub-assemble/gen.vesafb.sh b/resources/utilities/grub-assemble/gen.vesafb.sh
index 97de823..627c7d4 100755
--- a/resources/utilities/grub-assemble/gen.vesafb.sh
+++ b/resources/utilities/grub-assemble/gen.vesafb.sh
@@ -11,11 +11,7 @@ set -u -e -v
 # This is where GRUB is expected to be (outside of the grub-assemble, instead in main checkout)
 grubdir="../../../grub"
 
-# Install modules (installed, but not automatically loaded)
-grub_install_modules="adler32 all_video archelp ata backtrace bitmap bitmap_scale cmp cpio_be cpio cpuid crc64 cs5536 div_test efiemu elf eval exfat extcmd file fshelp gettext gfxmenu gptsync gzio hashsum hexdump http linux16 loadenv lzopio mda_text mmap mpi msdospart multiboot2 multiboot nativedisk net newc ntfscomp ntfs odc offsetio parttool priority_queue procfs progress read relocator scsi search_fs_file search_fs_uuid search_label search setjmp setpci sleep squash4 tar terminfo testload testspeed tftp time trig tr true udf ufs1_be ufs1 ufs2 usbserial_common usbserial_ftdi usbserial_pl2303 usbserial_usbdebug usbtest video_colors videotest_checksum xzio"
-
-# Modules (and always loaded)
-grub_modules="acpi ahci at_keyboard boot cat cbfs cbls cbtime chain cmosdump cmostest cbmemc crypto cryptodisk configfile datehook date datetime diskfilter disk echo ext2 ehci fat halt help iorw iso9660 keystatus linux loopback ls lsacpi lsmmap lspci luks lvm memdisk minicmd memrw morse normal ohci part_gpt part_msdos password password_pbkdf2 pbkdf2 pcidump pci play probe reboot serial terminal test usb_keyboard usbms uhci gcry_arcfour gcry_blowfish gcry_camellia gcry_cast5 gcry_crc gcry_des gcry_dsa gcry_idea gcry_md4 gcry_md5 gcry_rfc2268 gcry_rijndael gcry_rmd160 gcry_rsa gcry_seed gcry_serpent gcry_sha1 gcry_sha256 gcry_sha512 gcry_tiger gcry_twofish gcry_whirlpool hdparm regexp spkmodem syslinuxcfg usb verify videoinfo videotest xfs btrfs zfs sfs romfs reiserfs nilfs2 minix_be minix3_be minix3 minix2_be minix2 minix jfs hfsplus hfs bfs afs affs gfxmenu gfxterm_background gfxterm_menu jpeg png tga pata"
+source "modules.conf"
 
 # Generate the grub.elf
 $grubdir/grub-mkstandalone \
diff --git a/resources/utilities/grub-assemble/modules.conf b/resources/utilities/grub-assemble/modules.conf
new file mode 100644
index 0000000..4bc1650
--- /dev/null
+++ b/resources/utilities/grub-assemble/modules.conf
@@ -0,0 +1,202 @@
+# Install modules (installed, but not automatically loaded)
+grub_install_modules=" \
+adler32 \
+all_video \
+archelp \
+ata \
+backtrace \
+bitmap \
+bitmap_scale \
+cmp \
+cpio_be \
+cpio \
+cpuid \
+crc64 \
+cs5536 \
+div_test \
+efiemu \
+elf \
+eval \
+exfat \
+extcmd \
+file \
+fshelp \
+gettext \
+gfxmenu \
+gptsync \
+gzio \
+hashsum \
+hexdump \
+http \
+linux16 \
+loadenv \
+lzopio \
+mda_text \
+mmap \
+mpi \
+msdospart \
+multiboot2 \
+multiboot \
+nativedisk \
+net \
+newc \
+ntfscomp \
+ntfs \
+odc \
+offsetio \
+parttool \
+priority_queue \
+procfs \
+progress \
+read \
+relocator \
+scsi \
+search_fs_file \
+search_fs_uuid \
+search_label \
+search \
+setjmp \
+setpci \
+sleep \
+squash4 \
+tar \
+terminfo \
+testload \
+testspeed \
+tftp \
+time \
+trig \
+tr \
+true \
+udf \
+ufs1_be \
+ufs1 \
+ufs2 \
+usbserial_common \
+usbserial_ftdi \
+usbserial_pl2303 \
+usbserial_usbdebug \
+usbtest \
+video_colors \
+videotest_checksum \
+xzio \
+"
+
+# Modules (and always loaded)
+grub_modules=" \
+acpi \
+ahci \
+at_keyboard \
+boot \
+cat \
+cbfs \
+cbls \
+cbtime \
+chain \
+cmosdump \
+cmostest \
+cbmemc \
+crypto \
+cryptodisk \
+configfile \
+datehook \
+date \
+datetime \
+diskfilter \
+disk \
+echo \
+ext2 \
+ehci \
+fat \
+halt \
+help \
+iorw \
+iso9660 \
+keystatus \
+linux \
+loopback \
+ls \
+lsacpi \
+lsmmap \
+lspci \
+luks \
+lvm \
+memdisk \
+minicmd \
+memrw \
+morse \
+normal \
+ohci \
+part_gpt \
+part_msdos \
+password \
+password_pbkdf2 \
+pbkdf2 \
+pcidump \
+pci \
+play \
+probe \
+reboot \
+serial \
+terminal \
+test \
+usb_keyboard \
+usbms \
+uhci \
+gcry_arcfour \
+gcry_blowfish \
+gcry_camellia \
+gcry_cast5 \
+gcry_crc \
+gcry_des \
+gcry_dsa \
+gcry_idea \
+gcry_md4 \
+gcry_md5 \
+gcry_rfc2268 \
+gcry_rijndael \
+gcry_rmd160 \
+gcry_rsa \
+gcry_seed \
+gcry_serpent \
+gcry_sha1 \
+gcry_sha256 \
+gcry_sha512 \
+gcry_tiger \
+gcry_twofish \
+gcry_whirlpool \
+hdparm \
+regexp \
+spkmodem \
+syslinuxcfg \
+usb \
+verify \
+videoinfo \
+videotest \
+xfs \
+btrfs \
+zfs \
+sfs \
+romfs \
+reiserfs \
+nilfs2 \
+minix_be \
+minix3_be \
+minix3 \
+minix2_be \
+minix2 \
+minix \
+jfs \
+hfsplus \
+hfs \
+bfs \
+afs \
+affs \
+gfxmenu \
+gfxterm_background \
+gfxterm_menu \
+jpeg \
+png \
+tga \
+pata \
+"