From: longpanda <admin@ventoy.net>
Date: Sun, 12 Jun 2022 04:01:48 +0000 (+0800)
Subject: Enable secure boot support option by default.
X-Git-Tag: v1.0.76~2
X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/commitdiff_plain/85d1910722e042a2e4a6c3b7c97b92159eb584c5?ds=sidebyside

Enable secure boot support option by default.
---

diff --git a/INSTALL/Ventoy2Disk.exe b/INSTALL/Ventoy2Disk.exe
index d1f344c..9a8078b 100644
Binary files a/INSTALL/Ventoy2Disk.exe and b/INSTALL/Ventoy2Disk.exe differ
diff --git a/INSTALL/Ventoy2Disk_ARM.exe b/INSTALL/Ventoy2Disk_ARM.exe
index 6728b95..ae30e8b 100644
Binary files a/INSTALL/Ventoy2Disk_ARM.exe and b/INSTALL/Ventoy2Disk_ARM.exe differ
diff --git a/INSTALL/Ventoy2Disk_ARM64.exe b/INSTALL/Ventoy2Disk_ARM64.exe
index eae677c..88c729e 100644
Binary files a/INSTALL/Ventoy2Disk_ARM64.exe and b/INSTALL/Ventoy2Disk_ARM64.exe differ
diff --git a/INSTALL/Ventoy2Disk_X64.exe b/INSTALL/Ventoy2Disk_X64.exe
index 32090c6..002ead9 100644
Binary files a/INSTALL/Ventoy2Disk_X64.exe and b/INSTALL/Ventoy2Disk_X64.exe differ
diff --git a/INSTALL/tool/VentoyWorker.sh b/INSTALL/tool/VentoyWorker.sh
index c3a43cc..c148f8c 100644
--- a/INSTALL/tool/VentoyWorker.sh
+++ b/INSTALL/tool/VentoyWorker.sh
@@ -13,7 +13,7 @@ print_usage() {
     echo ''
     echo '  OPTION: (optional)'
     echo '   -r SIZE_MB  preserve some space at the bottom of the disk (only for install)'
-    echo '   -s/-S       enable/disable secure boot support (default is disabled)'
+    echo '   -s/-S       enable/disable secure boot support (default is enabled)'
     echo '   -g          use GPT partition style, default is MBR (only for install)'
     echo '   -L          Label of the 1st exfat partition (default is Ventoy)'
     echo '   -n          try non-destructive installation (only for install)'
@@ -21,6 +21,7 @@ print_usage() {
 }
 
 
+SECUREBOOT="YES"
 VTNEW_LABEL='Ventoy'
 RESERVE_SIZE_MB=0
 while [ -n "$1" ]; do
diff --git a/INSTALL/tool/aarch64/Ventoy2Disk.gtk3 b/INSTALL/tool/aarch64/Ventoy2Disk.gtk3
index 8f900e7..0d25154 100644
Binary files a/INSTALL/tool/aarch64/Ventoy2Disk.gtk3 and b/INSTALL/tool/aarch64/Ventoy2Disk.gtk3 differ
diff --git a/INSTALL/tool/aarch64/Ventoy2Disk.qt5 b/INSTALL/tool/aarch64/Ventoy2Disk.qt5
index b8e2b18..763408e 100644
Binary files a/INSTALL/tool/aarch64/Ventoy2Disk.qt5 and b/INSTALL/tool/aarch64/Ventoy2Disk.qt5 differ
diff --git a/INSTALL/tool/i386/Ventoy2Disk.gtk2 b/INSTALL/tool/i386/Ventoy2Disk.gtk2
index 75997cc..4d2feab 100644
Binary files a/INSTALL/tool/i386/Ventoy2Disk.gtk2 and b/INSTALL/tool/i386/Ventoy2Disk.gtk2 differ
diff --git a/INSTALL/tool/i386/Ventoy2Disk.gtk3 b/INSTALL/tool/i386/Ventoy2Disk.gtk3
index d22f558..7d332fe 100644
Binary files a/INSTALL/tool/i386/Ventoy2Disk.gtk3 and b/INSTALL/tool/i386/Ventoy2Disk.gtk3 differ
diff --git a/INSTALL/tool/i386/Ventoy2Disk.qt5 b/INSTALL/tool/i386/Ventoy2Disk.qt5
index 644fbd8..04e8781 100644
Binary files a/INSTALL/tool/i386/Ventoy2Disk.qt5 and b/INSTALL/tool/i386/Ventoy2Disk.qt5 differ
diff --git a/INSTALL/tool/mips64el/Ventoy2Disk.gtk3 b/INSTALL/tool/mips64el/Ventoy2Disk.gtk3
index 654791f..5a4cc8c 100644
Binary files a/INSTALL/tool/mips64el/Ventoy2Disk.gtk3 and b/INSTALL/tool/mips64el/Ventoy2Disk.gtk3 differ
diff --git a/INSTALL/tool/mips64el/Ventoy2Disk.qt5 b/INSTALL/tool/mips64el/Ventoy2Disk.qt5
index 1bc1b8e..43c3c2e 100644
Binary files a/INSTALL/tool/mips64el/Ventoy2Disk.qt5 and b/INSTALL/tool/mips64el/Ventoy2Disk.qt5 differ
diff --git a/INSTALL/tool/x86_64/Ventoy2Disk.gtk2 b/INSTALL/tool/x86_64/Ventoy2Disk.gtk2
index f2de21e..4ebc7fa 100644
Binary files a/INSTALL/tool/x86_64/Ventoy2Disk.gtk2 and b/INSTALL/tool/x86_64/Ventoy2Disk.gtk2 differ
diff --git a/INSTALL/tool/x86_64/Ventoy2Disk.gtk3 b/INSTALL/tool/x86_64/Ventoy2Disk.gtk3
index d8a848a..2e7c5d2 100644
Binary files a/INSTALL/tool/x86_64/Ventoy2Disk.gtk3 and b/INSTALL/tool/x86_64/Ventoy2Disk.gtk3 differ
diff --git a/INSTALL/tool/x86_64/Ventoy2Disk.qt5 b/INSTALL/tool/x86_64/Ventoy2Disk.qt5
index 2a0ff2a..59c77d3 100644
Binary files a/INSTALL/tool/x86_64/Ventoy2Disk.qt5 and b/INSTALL/tool/x86_64/Ventoy2Disk.qt5 differ
diff --git a/LinuxGUI/Ventoy2Disk/GTK/ventoy_gtk.c b/LinuxGUI/Ventoy2Disk/GTK/ventoy_gtk.c
index a1ef3dc..f3383bd 100644
--- a/LinuxGUI/Ventoy2Disk/GTK/ventoy_gtk.c
+++ b/LinuxGUI/Ventoy2Disk/GTK/ventoy_gtk.c
@@ -38,7 +38,7 @@
 #include <gdk/gdkkeysyms.h>
 #include "ventoy_gtk.h"
 
-int g_secure_boot_support = 0;
+int g_secure_boot_support = 1;
 GtkWidget *g_topWindow = NULL;
 GtkWidget *g_partCfgWindow = NULL;
 GtkBuilder *g_pXmlBuilder = NULL;
diff --git a/LinuxGUI/Ventoy2Disk/QT/ventoy2diskwindow.cpp b/LinuxGUI/Ventoy2Disk/QT/ventoy2diskwindow.cpp
index eac24eb..e9424da 100644
--- a/LinuxGUI/Ventoy2Disk/QT/ventoy2diskwindow.cpp
+++ b/LinuxGUI/Ventoy2Disk/QT/ventoy2diskwindow.cpp
@@ -436,7 +436,8 @@ void Ventoy2DiskWindow::OnInitWindow(void)
     QPixmap pix2;
     char ver[512];
 
-    ui->labelVentoyLocalSecure->hide();
+    //ui->labelVentoyLocalSecure->hide();
+    ui->actionSecure_Boot_Support->trigger();
 
     m_part_group->addAction(ui->actionMBR);
     m_part_group->addAction(ui->actionGPT);
diff --git a/LinuxGUI/WebUI/index.html b/LinuxGUI/WebUI/index.html
index 2ebdff2..975ce10 100644
--- a/LinuxGUI/WebUI/index.html
+++ b/LinuxGUI/WebUI/index.html
@@ -1043,7 +1043,7 @@
     }
     
     on_select_mbr();
-    secure_boot_check(0);
+    secure_boot_check(1);
     
     on_enable_preserve_space();