Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
randompersononinternet69 committed Sep 21, 2024
1 parent 033db8d commit f65ffa8
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 18 deletions.
39 changes: 24 additions & 15 deletions boot/grubfm/osdetect.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ function to_win_ver {
fi;
}

# get device info, including size, filesystem and label
# result is stored in $info
function dev_info {
unset size;
unset fs;
Expand Down Expand Up @@ -103,22 +105,30 @@ if [ -f "(${device})/boot/grub/grub.cfg" ];
fi;

# not tested, but it should work under EFI. Legacy BIOS will fail to load this though
menuentry "Boot Ventoy" {
# set terminal output to console
terminal_output console

# load Ventoy EFI bootloader for EFI systems
if [ "${grub_platform}" == "efi" ]; then
set root=${device}
echo Found ventoy EFI bootloader on ${device}
chainloader (${root})/EFI/BOOT/ventoyx64.efi
# load Ventoy BIOS bootloader for Legacy BIOS systems
for ventoy_device in (hd*,*); do
if [ -e "${ventoy_device}/EFI/BOOT/ventoyx64.efi" ]; then
echo "Found ventoy bootloader on ${ventoy_device}"
menuentry "Boot Ventoy" {
# set terminal output to console
terminal_output console

# load Ventoy EFI bootloader for EFI systems
if [ "${grub_platform}" == "efi" ]; then
echo "Loading Ventoy EFI bootloader"
set root=${ventoy_device}
chainloader (${root})/EFI/BOOT/ventoyx64.efi
# load Ventoy BIOS bootloader for Legacy BIOS systems
else
echo "Loading Ventoy BIOS bootloader"
set root=${ventoy_device}
chainloader (${root})/ventoy/core.img
fi
}
break
else
set root=${device}
echo Found ventoy BIOS bootloader on ${device}
chainloader (${root})/ventoy/core.img
echo "Did not find ventoy EFI bootloader on ${ventoy_device}"
fi
}
done

menuentry "Search for /boot/grubfm/config and load it" {
search --set=user -f -q /boot/grubfm/config
Expand Down Expand Up @@ -198,7 +208,6 @@ menuentry "Search for /boot/grubfm/config and load it" {
then
echo "Skip NT ${sysver}";
else
# this one will just load a specific installation of Windows, but via g2fm with NTBOOT
menuentry $"Boot ${winver} on ${device} ${info}" "${device}" --class nt6 {
set root="${2}";
set lang=en_US;
Expand Down
1 change: 0 additions & 1 deletion boot/grubfm/themes/slack/fm.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ terminal-box: "term_bkg_*.png"
icon_height = 32
item_icon_space = 20
selected_item_pixmap_style= "select_bkg_*.png"
menu_pixmap_style = "menu_bkg_*.png"
scrollbar = true
scrollbar_width = 16
scrollbar_thumb = "sb_thumb_*.png"
Expand Down
1 change: 0 additions & 1 deletion boot/grubfm/themes/slack/theme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ terminal-box: "term_bkg_*.png"
icon_height = 32
item_icon_space = 20
selected_item_pixmap_style= "select_bkg_*.png"
# menu_pixmap_style = "menu_bkg_*.png"
scrollbar = true
scrollbar_width = 16
scrollbar_thumb = "sb_thumb_*.png"
Expand Down
2 changes: 1 addition & 1 deletion boot/grubfm/ver
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8c3a272d-c816-44c2-95c9-c68d31cb5050
3c17590f-a0f8-4fbc-878a-15a49c50c7a3
Binary file added g2fm-en_US.7z
Binary file not shown.
Binary file added samples/loadfm
Binary file not shown.

0 comments on commit f65ffa8

Please sign in to comment.