From: longpanda <admin@ventoy.net>
Date: Sun, 26 Jul 2020 04:12:57 +0000 (+0800)
Subject: Merge branch 'master' of https://github.com/ventoy/Ventoy
X-Git-Tag: v1.0.18~6
X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/commitdiff_plain/036e9cc1679ddd3fbb07257b88ff9d76c92f9224?hp=26258653b7819645c62c4974b4cde62f7702fdfc

Merge branch 'master' of https://github.com/ventoy/Ventoy
---

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index a4b8f85..865c923 100644
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -624,7 +624,7 @@ function efi_unsupport_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.16"
+set VENTOY_VERSION="1.0.17"
 
 # Default menu display mode, you can change it as you want.
 #    0: List mode   
diff --git a/INSTALL/grub/i386-pc/file.mod b/INSTALL/grub/i386-pc/file.mod
new file mode 100644
index 0000000..29488fc
Binary files /dev/null and b/INSTALL/grub/i386-pc/file.mod differ
diff --git a/INSTALL/grub/i386-pc/net.mod b/INSTALL/grub/i386-pc/net.mod
new file mode 100644
index 0000000..3375270
Binary files /dev/null and b/INSTALL/grub/i386-pc/net.mod differ
diff --git a/INSTALL/grub/i386-pc/pbkdf2.mod b/INSTALL/grub/i386-pc/pbkdf2.mod
new file mode 100644
index 0000000..84f05ea
Binary files /dev/null and b/INSTALL/grub/i386-pc/pbkdf2.mod differ
diff --git a/INSTALL/grub/x86_64-efi/efinet.mod b/INSTALL/grub/x86_64-efi/efinet.mod
new file mode 100644
index 0000000..6cef7b1
Binary files /dev/null and b/INSTALL/grub/x86_64-efi/efinet.mod differ
diff --git a/INSTALL/grub/x86_64-efi/file.mod b/INSTALL/grub/x86_64-efi/file.mod
new file mode 100644
index 0000000..e727f5f
Binary files /dev/null and b/INSTALL/grub/x86_64-efi/file.mod differ
diff --git a/INSTALL/grub/x86_64-efi/help.mod b/INSTALL/grub/x86_64-efi/help.mod
new file mode 100644
index 0000000..9c27d63
Binary files /dev/null and b/INSTALL/grub/x86_64-efi/help.mod differ
diff --git a/INSTALL/grub/x86_64-efi/time.mod b/INSTALL/grub/x86_64-efi/time.mod
new file mode 100644
index 0000000..7112f0c
Binary files /dev/null and b/INSTALL/grub/x86_64-efi/time.mod differ
diff --git a/INSTALL/ventoy/ventoy.cpio b/INSTALL/ventoy/ventoy.cpio
index 79d9b33..5118f4e 100644
Binary files a/INSTALL/ventoy/ventoy.cpio and b/INSTALL/ventoy/ventoy.cpio differ