Commit a5c70651 authored by longpanda's avatar longpanda
Browse files

1.0.13 release

parent 785255b6
if [ "$grub_platform" = "pc" ]; then
menuentry 'Search and boot Windows' {
if search -n -s -f /bootmgr; then
ntldr /bootmgr
elif search -n -s -f /ntldr; then
ntldr /ntldr
else
echo "Windows NOT found ..."
fi
}
menuentry 'Boot the 1st local disk' {
set root=(hd0,1)
chainloader +1
boot
}
menuentry 'Boot the 2nd local disk' {
set root=(hd1,1)
chainloader +1
boot
}
menuentry 'Boot the 3rd local disk' {
set root=(hd2,1)
chainloader +1
boot
}
else
menuentry 'Search and boot Windows' {
if search -n -s -f /EFI/Microsoft/Boot/bootmgfw.efi; then
terminal_output console
chainloader /EFI/Microsoft/Boot/bootmgfw.efi
boot
else
echo "Windows NOT found ..."
fi
}
menuentry 'Search and boot BOOTX64.EFI' {
if search -n -s -f /efi/boot/bootx64.efi; then
terminal_output console
chainloader /efi/boot/bootx64.efi
boot
else
echo "BOOTX64.EFI NOT found ..."
fi
}
fi
menuentry 'Return to menu [Esc]' VTOY_RET {
echo 'Return ...'
}
...@@ -7,7 +7,7 @@ menuentry Reboot { ...@@ -7,7 +7,7 @@ menuentry Reboot {
menuentry Halt { menuentry Halt {
echo -e '\n\nSystem is halting ... \n' echo -e '\n\nSystem is halting ... \n'
sleep 1 sleep 1
reboot halt
} }
menuentry 'Return to menu [Esc]' VTOY_RET { menuentry 'Return to menu [Esc]' VTOY_RET {
......
desktop-image: "background.png" desktop-image: "background.png"
title-text: " " title-text: " "
title-font: "ascii"
title-color: "#ffffff" title-color: "#ffffff"
message-font: "ascii"
message-color: "#f2f2f2" message-color: "#f2f2f2"
terminal-box: "terminal_box_*.png" terminal-box: "terminal_box_*.png"
...@@ -16,14 +14,12 @@ terminal-box: "terminal_box_*.png" ...@@ -16,14 +14,12 @@ terminal-box: "terminal_box_*.png"
menu_pixmap_style = "menu_*.png" menu_pixmap_style = "menu_*.png"
item_font = "ascii"
item_color = "#ffffff" item_color = "#ffffff"
item_height = 30 item_height = 30
item_spacing = 1 item_spacing = 1
item_padding = 1 item_padding = 1
selected_item_font = "ascii"
selected_item_color= "#f2f2f2" selected_item_color= "#f2f2f2"
selected_item_pixmap_style = "select_*.png" selected_item_pixmap_style = "select_*.png"
...@@ -67,8 +63,8 @@ terminal-box: "terminal_box_*.png" ...@@ -67,8 +63,8 @@ terminal-box: "terminal_box_*.png"
+ hbox{ + hbox{
left = 90% left = 30%
top = 30 top = 95%-50
width = 10% width = 10%
height = 25 height = 25
+ label {text = "@VTOY_ISO_RAW@" color = "red" align = "left"} + label {text = "@VTOY_ISO_RAW@" color = "red" align = "left"}
......
...@@ -278,7 +278,7 @@ EOF ...@@ -278,7 +278,7 @@ EOF
echo "create efi fat fs $PART2 ..." echo "create efi fat fs $PART2 ..."
for i in 0 1 2 3 4 5 6 7 8 9; do for i in 0 1 2 3 4 5 6 7 8 9; do
if mkfs.vfat -F 16 -n EFI $PART2; then if mkfs.vfat -F 16 -n VTOYEFI $PART2; then
echo 'success' echo 'success'
break break
else else
......
No preview for this file type
...@@ -80,6 +80,14 @@ typedef struct ventoy_os_param ...@@ -80,6 +80,14 @@ typedef struct ventoy_os_param
grub_uint8_t reserved[31]; grub_uint8_t reserved[31];
}ventoy_os_param; }ventoy_os_param;
typedef struct ventoy_iso9660_override
{
uint32_t first_sector;
uint32_t first_sector_be;
uint32_t size;
uint32_t size_be;
}ventoy_iso9660_override;
#pragma pack() #pragma pack()
// compile assert to check that size of ventoy_os_param must be 512 // compile assert to check that size of ventoy_os_param must be 512
......
...@@ -492,9 +492,9 @@ static int VentoyFatDiskRead(uint32 Sector, uint8 *Buffer, uint32 SectorCount) ...@@ -492,9 +492,9 @@ static int VentoyFatDiskRead(uint32 Sector, uint8 *Buffer, uint32 SectorCount)
static CHAR GetMountLogicalDrive(void) static CHAR GetMountLogicalDrive(void)
{ {
CHAR Letter = 'Z'; CHAR Letter = 'Y';
DWORD Drives; DWORD Drives;
DWORD Mask = 0x2000000; DWORD Mask = 0x1000000;
Drives = GetLogicalDrives(); Drives = GetLogicalDrives();
Log("Drives=0x%x", Drives); Log("Drives=0x%x", Drives);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment