]> glassweightruler.freedombox.rocks Git - Ventoy.git/commitdiff
Enable secure boot support option by default.
authorlongpanda <admin@ventoy.net>
Sun, 12 Jun 2022 04:01:48 +0000 (12:01 +0800)
committerlongpanda <admin@ventoy.net>
Sun, 12 Jun 2022 04:01:48 +0000 (12:01 +0800)
18 files changed:
INSTALL/Ventoy2Disk.exe
INSTALL/Ventoy2Disk_ARM.exe
INSTALL/Ventoy2Disk_ARM64.exe
INSTALL/Ventoy2Disk_X64.exe
INSTALL/tool/VentoyWorker.sh
INSTALL/tool/aarch64/Ventoy2Disk.gtk3
INSTALL/tool/aarch64/Ventoy2Disk.qt5
INSTALL/tool/i386/Ventoy2Disk.gtk2
INSTALL/tool/i386/Ventoy2Disk.gtk3
INSTALL/tool/i386/Ventoy2Disk.qt5
INSTALL/tool/mips64el/Ventoy2Disk.gtk3
INSTALL/tool/mips64el/Ventoy2Disk.qt5
INSTALL/tool/x86_64/Ventoy2Disk.gtk2
INSTALL/tool/x86_64/Ventoy2Disk.gtk3
INSTALL/tool/x86_64/Ventoy2Disk.qt5
LinuxGUI/Ventoy2Disk/GTK/ventoy_gtk.c
LinuxGUI/Ventoy2Disk/QT/ventoy2diskwindow.cpp
LinuxGUI/WebUI/index.html

index d1f344cd781dbcc4ef19018f9c34fb276a186250..9a8078b6ee14a08d2b8a2282a375e9ffd445f5e7 100644 (file)
Binary files a/INSTALL/Ventoy2Disk.exe and b/INSTALL/Ventoy2Disk.exe differ
index 6728b95730e6bb90fbfbce0c9ad7f5bc0b8db7e9..ae30e8bf168a784fcbbeb64f4a05d57e838a4773 100644 (file)
Binary files a/INSTALL/Ventoy2Disk_ARM.exe and b/INSTALL/Ventoy2Disk_ARM.exe differ
index eae677c03e3a69f8671e166ed251fd5da79826a5..88c729e5ee44eb770adc9bbdc328bee7fe3a7581 100644 (file)
Binary files a/INSTALL/Ventoy2Disk_ARM64.exe and b/INSTALL/Ventoy2Disk_ARM64.exe differ
index 32090c64da63717cca2c3d47307c8720ff98ccc9..002ead95fc4b03b6d5081ebebbf92865e02a4575 100644 (file)
Binary files a/INSTALL/Ventoy2Disk_X64.exe and b/INSTALL/Ventoy2Disk_X64.exe differ
index c3a43cc34bc74d7b433942382ee9f2c399155ffd..c148f8c84c5bbbbf920f0a3f5db18a671b96b1db 100644 (file)
@@ -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 ''
     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)'
     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
 VTNEW_LABEL='Ventoy'
 RESERVE_SIZE_MB=0
 while [ -n "$1" ]; do
index 8f900e7e3d11b96b46705a20bc511426cb00ed50..0d25154d721bd370195b208f8d46c01eca71de14 100644 (file)
Binary files a/INSTALL/tool/aarch64/Ventoy2Disk.gtk3 and b/INSTALL/tool/aarch64/Ventoy2Disk.gtk3 differ
index b8e2b180808a9169528d1beab790d2752667b77d..763408ed8bbd390d558dc4ec43d29f04e4a34a0b 100644 (file)
Binary files a/INSTALL/tool/aarch64/Ventoy2Disk.qt5 and b/INSTALL/tool/aarch64/Ventoy2Disk.qt5 differ
index 75997cc1809b065e1a291a2f23ab0cd490949ba5..4d2feab66039cbaf47b92728cab269d8d5273996 100644 (file)
Binary files a/INSTALL/tool/i386/Ventoy2Disk.gtk2 and b/INSTALL/tool/i386/Ventoy2Disk.gtk2 differ
index d22f558fbd9c0257282afcc1b8434a28663a3890..7d332fe7873d803daed796aeec637501bd36ece6 100644 (file)
Binary files a/INSTALL/tool/i386/Ventoy2Disk.gtk3 and b/INSTALL/tool/i386/Ventoy2Disk.gtk3 differ
index 644fbd8d0c69b79101a4147bfb36d486e397bc1c..04e87815b659a8ec6274809825cdf45841c38a9d 100644 (file)
Binary files a/INSTALL/tool/i386/Ventoy2Disk.qt5 and b/INSTALL/tool/i386/Ventoy2Disk.qt5 differ
index 654791f44204eef28619212f379b03ff050645d5..5a4cc8c1cdbbc44e6b4d32f0e46a2e4cd6833cb1 100644 (file)
Binary files a/INSTALL/tool/mips64el/Ventoy2Disk.gtk3 and b/INSTALL/tool/mips64el/Ventoy2Disk.gtk3 differ
index 1bc1b8e6eb5195bb6343d7fa2e019046c8dbbf4c..43c3c2e37ccc20c6684dd604a396d7bbbd0b6e7e 100644 (file)
Binary files a/INSTALL/tool/mips64el/Ventoy2Disk.qt5 and b/INSTALL/tool/mips64el/Ventoy2Disk.qt5 differ
index f2de21e5ed11236c1e588d7cffe39ad2b69c1d2d..4ebc7fac03ba28698fb43d0bde7cb5127f83f19e 100644 (file)
Binary files a/INSTALL/tool/x86_64/Ventoy2Disk.gtk2 and b/INSTALL/tool/x86_64/Ventoy2Disk.gtk2 differ
index d8a848a15dab15caed015568579cb1ab40948f73..2e7c5d237d90671a9b8aa61ada990aec2d347649 100644 (file)
Binary files a/INSTALL/tool/x86_64/Ventoy2Disk.gtk3 and b/INSTALL/tool/x86_64/Ventoy2Disk.gtk3 differ
index 2a0ff2a5d9b3304b7f6d878bdac6a23804c4e033..59c77d33221cbf277c0fba5f8c96459561629a85 100644 (file)
Binary files a/INSTALL/tool/x86_64/Ventoy2Disk.qt5 and b/INSTALL/tool/x86_64/Ventoy2Disk.qt5 differ
index a1ef3dc281ddba43cb2eb1fc68b77ba7779c5c69..f3383bd63f131c5dacb61cb73d667f55dfd70ed4 100644 (file)
@@ -38,7 +38,7 @@
 #include <gdk/gdkkeysyms.h>
 #include "ventoy_gtk.h"
 
 #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;
 GtkWidget *g_topWindow = NULL;
 GtkWidget *g_partCfgWindow = NULL;
 GtkBuilder *g_pXmlBuilder = NULL;
index eac24eb8c0162bacae174d2c802c4bf145e0e9c5..e9424da6bdb65064d830196f260992effa5fee98 100644 (file)
@@ -436,7 +436,8 @@ void Ventoy2DiskWindow::OnInitWindow(void)
     QPixmap pix2;
     char ver[512];
 
     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);
 
     m_part_group->addAction(ui->actionMBR);
     m_part_group->addAction(ui->actionGPT);
index 2ebdff29505c1cbcb307cbf21768130fd8f99a2b..975ce10bc8397663e415c525d76e10a832e06a85 100644 (file)
     }\r
     \r
     on_select_mbr();\r
     }\r
     \r
     on_select_mbr();\r
-    secure_boot_check(0);\r
+    secure_boot_check(1);\r
     \r
     on_enable_preserve_space();\r
     \r
     \r
     on_enable_preserve_space();\r
     \r