1.0.65 release

diff --git a/.github/ISSUE_TEMPLATE/issue_template.yml b/.github/ISSUE_TEMPLATE/issue_template.yml
index 18ae2c4a484b6ec074983f518aaa6540b71a8d0a..85ed49e3ef9642ef44c4bcb32fb368243e2f8628 100644 (file)
--- a/.github/ISSUE_TEMPLATE/issue_template.yml
+++ b/.github/ISSUE_TEMPLATE/issue_template.yml
@@ -21,7 +21,7 @@ body:
     attributes:
       label: Ventoy Version
       description: What version of ventoy are you running?
-      placeholder: 1.0.64
+      placeholder: 1.0.65
     validations:
       required: true
   - type: dropdown

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 670cea293c53dce5cffc466e3f8aaf95df0f77a7..8b510b29e07c64657eb6e5af5e36f2d807280827 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,6 +27,10 @@ jobs:
       with:
         name: ventoy-livecd
         path: INSTALL/ventoy-*livecd*
+    - uses: actions/upload-artifact@v2
+      with:
+        name: SHA256SUM
+        path: INSTALL/sha256.txt
     - uses: actions/upload-artifact@v2
       with:
         name: xxx-build-log

diff --git a/IMG/cpio/ventoy/hook/debian/default-hook.sh b/IMG/cpio/ventoy/hook/debian/default-hook.sh
index 4b528320e5644abdc559bf67f770040a2de2d2ce..37f5a9ed6f9ae03f468bf116da4db01d1e73a69f 100644 (file)
--- a/IMG/cpio/ventoy/hook/debian/default-hook.sh
+++ b/IMG/cpio/ventoy/hook/debian/default-hook.sh
@@ -54,8 +54,15 @@ fi
 if [ -f $VTOY_PATH/autoinstall ]; then
     echo "Do auto install ..." >> $VTLOG
     
-    if $GREP -q "^mount /proc$" /init; then
-        $SED "/^mount \/proc/a export file=$VTOY_PATH/autoinstall; export auto='true'; export priority='critical'"  -i /init
+    if $GREP -q '^autoinstall:' $VTOY_PATH/autoinstall; then
+        echo "cloud-init auto install ..." >> $VTLOG
+        if $GREP -q "maybe_break init" /init; then
+            $SED "/maybe_break init/i $BUSYBOX_PATH/sh $VTOY_PATH/hook/debian/ventoy-cloud-init.sh \$rootmnt"  -i /init
+        fi
+    else
+        if $GREP -q "^mount /proc$" /init; then
+            $SED "/^mount \/proc/a export file=$VTOY_PATH/autoinstall; export auto='true'; export priority='critical'"  -i /init
+        fi
     fi
 fi
 

diff --git a/IMG/cpio/ventoy/hook/debian/ventoy-cloud-init.sh b/IMG/cpio/ventoy/hook/debian/ventoy-cloud-init.sh
new file mode 100644 (file)
index 0000000..875b496
--- /dev/null
+++ b/IMG/cpio/ventoy/hook/debian/ventoy-cloud-init.sh
@@ -0,0 +1,63 @@
+#!/ventoy/busybox/sh
+#************************************************************************************
+# Copyright (c) 2020, longpanda <admin@ventoy.net>
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3 of the
+# License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# 
+#************************************************************************************
+
+. /ventoy/hook/ventoy-hook-lib.sh
+
+vtlog "####### $0 $* ########"
+
+VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH
+
+newroot=$1
+
+dd if=/dev/zero of=$newroot/tmp/cidata.img bs=1M count=8 status=none
+freeloop=$(losetup -f)
+
+losetup $freeloop $newroot/tmp/cidata.img
+
+mkfs.vfat -n CIDATA $freeloop
+
+mkdir /tmpcidata
+mount $newroot/tmp/cidata.img /tmpcidata
+
+vtSplit=$(grep VENTOY_META_DATA_SPLIT $VTOY_PATH/autoinstall | wc -l)
+if [ $vtSplit -eq 1 ]; then
+    vtlog "split autoinstall script to user-data and meta-data"
+    vtLine=$(grep -n VENTOY_META_DATA_SPLIT $VTOY_PATH/autoinstall | awk -F: '{print $1}')
+    vtLine1=$(expr $vtLine - 1)
+    vtLine2=$(expr $vtLine + 1)
+    vtlog "Line number: $vtLine $vtLine1 $vtLine2"
+    sed -n "1,${vtLine1}p"  $VTOY_PATH/autoinstall >/tmpcidata/user-data
+    sed -n "${vtLine2},\$p" $VTOY_PATH/autoinstall >/tmpcidata/meta-data
+else
+    vtlog "only user-data avaliable"
+    cp -a $VTOY_PATH/autoinstall  /tmpcidata/user-data
+    touch /tmpcidata/meta-data
+fi
+
+
+umount /tmpcidata
+rm -rf /tmpcidata
+
+vtCMD=$(cat /proc/cmdline)
+echo "autoinstall $vtCMD" > $newroot/tmp/kcmdline
+mount --bind $newroot/tmp/kcmdline  /proc/cmdline
+
+
+PATH=$VTPATH_OLD
+

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index d84a9d38f74297d0f72acd00df02112f181b4f51..4840c576f262a20dad92b09c08fa4438b4327eed 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -2022,7 +2022,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.64"
+set VENTOY_VERSION="1.0.65"
 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1

diff --git a/INSTALL/ventoy_pack.sh b/INSTALL/ventoy_pack.sh
index 013cf475dde2ee2a1fd46348a5e54ac7185439ae..315d840a99ad0e50093d2b2c967dcd702fa97609 100644 (file)
--- a/INSTALL/ventoy_pack.sh
+++ b/INSTALL/ventoy_pack.sh
@@ -217,4 +217,6 @@ else
 fi
 
 rm -f log.txt
+rm -f sha256.txt
+sha256sum ventoy-${curver}-* > sha256.txt
 

diff --git a/LinuxGUI/Ventoy2Disk/Core/ventoy_util.c b/LinuxGUI/Ventoy2Disk/Core/ventoy_util.c
index 38ac8d59d743e8e856fb8e6e3c01d5c0e6919724..27c015fb0d35ae8ff11fcaaa4854bfdb0b52ae1c 100644 (file)
--- a/LinuxGUI/Ventoy2Disk/Core/ventoy_util.c
+++ b/LinuxGUI/Ventoy2Disk/Core/ventoy_util.c
@@ -299,6 +299,7 @@ static int VentoyFillProtectMBR(uint64_t DiskSizeBytes, MBR_HEAD *pMBR)
     vdebug("Disk signature: 0x%08x\n", DiskSignature);
 
     memcpy(pMBR->BootCode + 0x1B8, &DiskSignature, 4);
+    memcpy(pMBR->BootCode + 0x180, &Guid, 16);
 
     DiskSectorCount = DiskSizeBytes / 512 - 1;
     if (DiskSectorCount > 0xFFFFFFFF)
@@ -490,6 +491,7 @@ int ventoy_fill_mbr(uint64_t size, uint64_t reserve, int align4k, MBR_HEAD *pMBR
     vdebug("Disk signature: 0x%08x\n", DiskSignature);
 
     memcpy(pMBR->BootCode + 0x1B8, &DiskSignature, 4);
+    memcpy(pMBR->BootCode + 0x180, &Guid, 16);
 
     if (size / 512 > 0xFFFFFFFF)
     {

diff --git a/README.md b/README.md
index 863da1d03148decfc2921c73f6ef06a4626a7b93..8ec5668918dd670415ab757aefbfdc13b080f439 100644 (file)
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ You can copy many image files at a time and ventoy will give you a boot menu to
 x86 Legacy BIOS, IA32 UEFI, x86_64 UEFI, ARM64 UEFI and MIPS64EL UEFI are supported in the same way.<br/>
 Both MBR and GPT partition style are supported in the same way.<br/>
 Most type of OS supported(Windows/WinPE/Linux/Unix/ChromeOS/Vmware/Xen...) <br/>
-  780+ ISO files are tested (<a href="https://www.ventoy.net/en/isolist.html">List</a>). 90%+ distros in <a href="https://distrowatch.com/">distrowatch.com</a> supported (<a href="https://www.ventoy.net/en/distrowatch.html">Details</a>). <br/>
+  800+ ISO files are tested (<a href="https://www.ventoy.net/en/isolist.html">List</a>). 90%+ distros in <a href="https://distrowatch.com/">distrowatch.com</a> supported (<a href="https://www.ventoy.net/en/distrowatch.html">Details</a>). <br/>
 <br/>Official Website: <a href=https://www.ventoy.net>https://www.ventoy.net</a>
 </h4>
 
@@ -58,7 +58,7 @@ A GUI Ventoy plugin configurator. [VentoyPlugson](https://www.ventoy.net/en/plug
 * FAT32/exFAT/NTFS/UDF/XFS/Ext2(3)(4) supported for main partition
 * ISO files larger than 4GB supported
 * Native boot menu style for Legacy & UEFI
-* Most type of OS supported, 780+ iso files tested
+* Most type of OS supported, 800+ iso files tested
 * Linux vDisk boot supported
 * Not only boot but also complete installation process
 * Menu dynamically switchable between List/TreeView mode