diff --git a/THANKS.md b/THANKS.md index a867a1f..04e97fc 100644 --- a/THANKS.md +++ b/THANKS.md @@ -1,6 +1,4 @@ -g2fm (GRUB2-filemanager) would not be what it is today without the invaluable help of -everybody who was kind enough to spend time testing it and reporting -bugs. +g2fm (GRUB2-filemanager) would not be what it is today without the invaluable help of everybody who was kind enough to spend time testing it and reporting bugs. g2fm (GRUB2-filemanager) is based on the following open source projects: diff --git a/boot/grub/loopback.cfg b/boot/grub/loopback.cfg deleted file mode 100644 index 3f21bc0..0000000 --- a/boot/grub/loopback.cfg +++ /dev/null @@ -1 +0,0 @@ -linux (${root})/grubfm.elf diff --git a/build.sh b/build.sh index 39a0a55..6355b4e 100755 --- a/build.sh +++ b/build.sh @@ -236,48 +236,6 @@ modules=$(cat arch/multiboot/builtin.lst) ./grub/grub-mkimage -m ./build/memdisk.xz -d ./grub/i386-multiboot -p "(memdisk)/boot/grubfm" -c arch/multiboot/config.cfg -o grubfm.elf -O i386-multiboot $modules rm build/memdisk.xz -echo "${YELLOW}i386-pc${RESET}" -builtin=$(cat arch/legacy/builtin.lst) -mkdir build/boot/grubfm/i386-pc -modlist="$(cat arch/legacy/insmod.lst) $(cat arch/legacy/optional.lst)" -for modules in $modlist -do - echo "${CYAN}copying ${modules}.mod" - cp grub/i386-pc/${modules}.mod build/boot/grubfm/i386-pc/ -done -cp arch/legacy/insmod.lst build/boot/grubfm/ -cp arch/multiboot/*.xz build/boot/grubfm/ -cp arch/multiboot/memdisk build/boot/grubfm/ -cp arch/multiboot/grub.exe build/boot/grubfm/ -cd build -find ./boot | cpio -o -H newc | xz -9 -e > ./fm.loop -cd .. -rm -r build/boot -./grub/grub-mkimage -d ./grub/i386-pc -p "(memdisk)/boot/grubfm" -c arch/legacy/config.cfg -o ./build/core.img -O i386-pc $builtin -cat grub/i386-pc/cdboot.img build/core.img > build/fmldr -rm build/core.img -touch build/ventoy.dat -echo "{$YELLOW}Loopback support{$RESET}" -mkdir boot/grub -cp loopback/loopback.cfg boot/grub/ -cp -R boot/grub build/boot/ -xorriso -as mkisofs -l -R -hide-joliet boot.catalog -b fmldr -no-emul-boot -allow-lowercase -boot-load-size 4 -boot-info-table -o grubfm_pc.iso build -rm build/fmldr -rm build/fm.loop - -echo "${YELLOW}i386-pc preloader${RESET}" -builtin=$(cat arch/legacy/preloader.lst) -./grub/grub-mkimage -d ./grub/i386-pc -p "(cd)/boot/grub" -c arch/legacy/preloader.cfg -o ./build/core.img -O i386-pc $builtin -cat grub/i386-pc/cdboot.img build/core.img > build/fmldr -rm build/core.img -cp grubfm.elf build/ -touch build/ventoy.dat -echo "{$YELLOW}Loopback support{$RESET}" -mkdir boot/grub -cp loopback/loopback.cfg boot/grub/ -cp -R boot/grub build/boot/ -xorriso -as mkisofs -l -R -hide-joliet boot.catalog -b fmldr -no-emul-boot -allow-lowercase -boot-load-size 4 -boot-info-table -o grubfm.iso build - echo "${YELLOW}making efi.img using files in the EFI directory${RESET}" dd if=/dev/zero of=build/efi.img bs=1M count=16 mkfs.vfat build/efi.img @@ -289,7 +247,7 @@ echo "{$YELLOW}Loopback support{$RESET}" mkdir boot/grub cp loopback/loopback.cfg boot/grub/ cp -R boot/grub build/boot/ -xorriso -as mkisofs -l -R -hide-joliet boot.catalog -b fmldr -no-emul-boot -allow-lowercase -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e efi.img -no-emul-boot -o g2fm_multiarch.iso build +xorriso -as mkisofs -l -R -hide-joliet boot.catalog -b fmldr -no-emul-boot -allow-lowercase -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e efi.img -no-emul-boot -o grubfm.iso build rm -r build echo ${CYAN}Done! diff --git a/loopback/loopback.cfg b/loopback/loopback.cfg index 3f21bc0..af48e74 100644 --- a/loopback/loopback.cfg +++ b/loopback/loopback.cfg @@ -1 +1,3 @@ +terminal_output console +echo Booting g2fm... linux (${root})/grubfm.elf