diff --git a/.github/ISSUE_TEMPLATE/issue_template.yml b/.github/ISSUE_TEMPLATE/issue_template.yml index ca5cd302..a8ea6e5b 100644 --- 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.47 + placeholder: 1.0.48 validations: required: true - type: dropdown @@ -73,6 +73,14 @@ body: - No. validations: required: false + - type: input + id: link + attributes: + label: Image file download link (if applicable) + description: What is the image file download link? + placeholder: https://xxx + validations: + required: false - type: textarea id: what-happened attributes: diff --git a/IMG/cpio/sbin/init b/IMG/cpio/sbin/init index 2696bc80..17be33fb 100644 --- a/IMG/cpio/sbin/init +++ b/IMG/cpio/sbin/init @@ -121,6 +121,11 @@ elif [ "$VTOY_ARCH" = "i386" ]; then ln -s $VTOY_PATH/tool/dmsetup32 $VTOY_PATH/tool/dmsetup ln -s $VTOY_PATH/tool/lunzip32 $VTOY_PATH/tool/lunzip + if uname -a | egrep -q 'x86_64|amd64'; then + echo "zstdcat use 64bit ..." >>$VTLOG + rm -f $VTOY_PATH/tool/zstdcat + ln -s $VTOY_PATH/tool/zstdcat64 $VTOY_PATH/tool/zstdcat + fi elif [ "$VTOY_ARCH" = "mips64el" ]; then echo "Use MIPS64 busybox toolkit ..." >>$VTLOG ln -s $BUSYBOX_PATH/xzminidecm64e $BUSYBOX_PATH/xzminidec diff --git a/INSTALL/README b/INSTALL/README index 645703eb..01bfb34c 100644 --- a/INSTALL/README +++ b/INSTALL/README @@ -21,9 +21,6 @@ Please refer https://www.ventoy.net/en/doc_start.html for details. 1. sudo sh VentoyWeb.sh 2. open your browser and visit http://127.0.0.1:24680 -========== VentoyWebDeepin.sh =============== -1. sudo sh VentoyWebDeepin.sh - ========== CreatePersistentImg.sh =============== diff --git a/INSTALL/Ventoy2Disk.exe b/INSTALL/Ventoy2Disk.exe index e8233717..d207ffdb 100644 Binary files a/INSTALL/Ventoy2Disk.exe and b/INSTALL/Ventoy2Disk.exe differ diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg index e0dc6544..eb35fa5a 100644 --- a/INSTALL/grub/grub.cfg +++ b/INSTALL/grub/grub.cfg @@ -1844,7 +1844,7 @@ function img_unsupport_menuentry { ############################################################# ############################################################# -set VENTOY_VERSION="1.0.47" +set VENTOY_VERSION="1.0.48" #ACPI not compatible with Window7/8, so disable by default set VTOY_PARAM_NO_ACPI=1 diff --git a/INSTALL/tool/WebDeepin.sh b/INSTALL/tool/WebDeepin.sh deleted file mode 100644 index b37f394c..00000000 --- a/INSTALL/tool/WebDeepin.sh +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/sh - -LOGFILE=log.txt -VUSER=$(get_user) - -if which browser >/dev/null 2>&1; then - : -else - if [ "$LANG" = "zh_CN.UTF-8" ]; then - echo " Built-in browser not found in the system, please use VentoyWeb.sh ..." - else - echo " 未找到系统内置的 browser (卸载了?)请使用 VentoyWeb.sh ..." - fi - exit 1 -fi - - -if [ -e $LOGFILE ]; then - chown $VUSER $LOGFILE -else - su $VUSER -c "touch $LOGFILE" -fi - -#delete the log.txt if it's more than 8MB -if [ -f $LOGFILE ]; then - logsize=$(stat -c '%s' $LOGFILE) - if [ $logsize -gt 8388608 ]; then - rm -f $LOGFILE - fi -fi - - -if [ -f ./tool/$TOOLDIR/V2DServer.xz ]; then - xz -d ./tool/$TOOLDIR/V2DServer.xz - chmod +x ./tool/$TOOLDIR/V2DServer -fi - -rm -rf ./*_VTMPDIR -vtWebTmpDir=$(mktemp -d -p ./ --suffix=_VTMPDIR) -chown $VUSER $vtWebTmpDir - - -V2DServer "$HOST" "$PORT" & -V2DPid=$! -sleep 1 - -su $VUSER -c "browser --window-size=550,400 --app=\"http://${HOST}:${PORT}/index.html?chrome-app\" --user-data-dir=$vtWebTmpDir >> $LOGFILE 2>&1" & -WebPid=$! - - -vtoy_trap_exit() { - - [ -d /proc/$V2DPid ] && kill -2 $V2DPid - [ -d /proc/$WebPid ] && kill -9 $WebPid - - while [ -n "1" ]; do - curPid=$(ps -ef | grep -m1 "$vtWebTmpDir" | egrep -v '\sgrep\s' | awk '{print $2}') - if [ -z "$curPid" ]; then - break - fi - - if [ -d /proc/$curPid ]; then - kill -9 $curPid - fi - done - - [ -d $vtWebTmpDir ] && rm -rf $vtWebTmpDir - - if [ -n "$OLDDIR" ]; then - CURDIR=$(pwd) - if [ "$CURDIR" != "$OLDDIR" ]; then - cd "$OLDDIR" - fi - fi - - exit 1 -} - -trap vtoy_trap_exit HUP INT QUIT TSTP -sleep 1 - - -vtVer=$(cat ventoy/version) -echo "" -echo "==================================================" -if [ "$LANG" = "zh_CN.UTF-8" ]; then - echo " Ventoy Server $vtVer 已经启动 ..." -else - echo " Ventoy Server $vtVer is running ..." -fi -echo "==================================================" -echo "" -echo "########### Press Ctrl + C to exit ###############" -echo "" - -wait $WebPid - -[ -d /proc/$V2DPid ] && kill -2 $V2DPid - -[ -d $vtWebTmpDir ] && rm -rf $vtWebTmpDir - -if [ -n "$OLDDIR" ]; then - CURDIR=$(pwd) - if [ "$CURDIR" != "$OLDDIR" ]; then - cd "$OLDDIR" - fi -fi diff --git a/INSTALL/tool/WebUos.sh b/INSTALL/tool/WebUos.sh deleted file mode 100644 index 793e85b0..00000000 --- a/INSTALL/tool/WebUos.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh - -LOGFILE=log.txt - -#delete the log.txt if it's more than 8MB -if [ -f $LOGFILE ]; then - logsize=$(stat -c '%s' $LOGFILE) - if [ $logsize -gt 8388608 ]; then - rm -f $LOGFILE - fi -fi - - -if [ -f ./tool/$TOOLDIR/V2DServer.xz ]; then - xz -d ./tool/$TOOLDIR/V2DServer.xz - chmod +x ./tool/$TOOLDIR/V2DServer -fi - -V2DServer "$HOST" "$PORT" & -V2DPid=$! -sleep 1 - - -vtoy_trap_exit() { - - [ -d /proc/$V2DPid ] && kill -2 $V2DPid - - if [ -n "$OLDDIR" ]; then - CURDIR=$(pwd) - if [ "$CURDIR" != "$OLDDIR" ]; then - cd "$OLDDIR" - fi - fi - - exit 1 -} - -trap vtoy_trap_exit HUP INT QUIT TSTP -sleep 1 - - -vtVer=$(cat ventoy/version) -echo "" -echo "==================================================" -if [ "$LANG" = "zh_CN.UTF-8" ]; then - echo " Ventoy Server $vtVer 已经启动 ..." -else - echo " Ventoy Server $vtVer is running ..." -fi -echo "==================================================" -echo "" -echo "########### Press Ctrl + C to exit ###############" -echo "" - -if [ "$VERBOSE" = "1" ]; then - uos-browser --window-size=550,400 --app="http://${HOST}:${PORT}/index.html?chrome-app" -else - uos-browser --window-size=550,400 --app="http://${HOST}:${PORT}/index.html?chrome-app" > /dev/null 2>&1 -fi - -[ -d /proc/$V2DPid ] && kill -2 $V2DPid - -if [ -n "$OLDDIR" ]; then - CURDIR=$(pwd) - if [ "$CURDIR" != "$OLDDIR" ]; then - cd "$OLDDIR" - fi -fi diff --git a/INSTALL/ventoy/vtoyjump32.exe b/INSTALL/ventoy/vtoyjump32.exe index 8050b0c3..06ea4bd0 100644 Binary files a/INSTALL/ventoy/vtoyjump32.exe and b/INSTALL/ventoy/vtoyjump32.exe differ diff --git a/INSTALL/ventoy/vtoyjump64.exe b/INSTALL/ventoy/vtoyjump64.exe index 51cb8f41..be90eabb 100644 Binary files a/INSTALL/ventoy/vtoyjump64.exe and b/INSTALL/ventoy/vtoyjump64.exe differ diff --git a/INSTALL/ventoy_pack.sh b/INSTALL/ventoy_pack.sh index e9b1a1c5..d6eedbaf 100644 --- a/INSTALL/ventoy_pack.sh +++ b/INSTALL/ventoy_pack.sh @@ -8,8 +8,7 @@ fi dos2unix -q ./tool/ventoy_lib.sh dos2unix -q ./tool/VentoyWorker.sh -dos2unix -q ./tool/WebDeepin.sh -dos2unix -q ./tool/WebUos.sh + . ./tool/ventoy_lib.sh @@ -101,7 +100,7 @@ cp $OPT ./tool $tmpdir/ rm -f $tmpdir/ENROLL_THIS_KEY_IN_MOKMANAGER.cer cp $OPT Ventoy2Disk.sh $tmpdir/ cp $OPT VentoyWeb.sh $tmpdir/ -cp $OPT VentoyWebDeepin.sh $tmpdir/ + #cp $OPT Ventoy.desktop $tmpdir/ cp $OPT README $tmpdir/ cp $OPT plugin $tmpdir/ @@ -109,7 +108,7 @@ cp $OPT CreatePersistentImg.sh $tmpdir/ cp $OPT ExtendPersistentImg.sh $tmpdir/ dos2unix -q $tmpdir/Ventoy2Disk.sh dos2unix -q $tmpdir/VentoyWeb.sh -dos2unix -q $tmpdir/VentoyWebDeepin.sh + #dos2unix -q $tmpdir/Ventoy.desktop dos2unix -q $tmpdir/CreatePersistentImg.sh dos2unix -q $tmpdir/ExtendPersistentImg.sh @@ -143,7 +142,7 @@ find $tmpdir/ -type d -exec chmod 755 "{}" + find $tmpdir/ -type f -exec chmod 644 "{}" + chmod +x $tmpdir/Ventoy2Disk.sh chmod +x $tmpdir/VentoyWeb.sh -chmod +x $tmpdir/VentoyWebDeepin.sh + #chmod +x $tmpdir/Ventoy.desktop chmod +x $tmpdir/CreatePersistentImg.sh chmod +x $tmpdir/ExtendPersistentImg.sh diff --git a/LANGUAGES/languages.json b/LANGUAGES/languages.json index d575bac8..214b01fd 100644 --- a/LANGUAGES/languages.json +++ b/LANGUAGES/languages.json @@ -46,7 +46,7 @@ "STR_WEB_SERVICE_BUSY":"الخدمة مشغولة ، يرجى إعادة المحاولة لاحقًا.", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -97,7 +97,7 @@ "STR_WEB_SERVICE_BUSY":"서비스가 사용 중입니다. 나중에 다시 시도하십시오.", "STR_MENU_VTSI_CREATE":"VTSI 파일 생성", "STR_VTSI_CREATE_TIP":"이번에는 장치에 쓰지 않고 VTSI 파일#@만 생성합니다.#@계속하시겠습니까?", - "STR_VTSI_CREATE_SUCCESS":"VTSI 파일이 성공적으로 생성되었습니다!#@Rufus(3.15+)를 사용하여 장치에 기록하여 Ventoy 설치를 완료할 수 있습니다.", + "STR_VTSI_CREATE_SUCCESS":"VTSI 파일이 성공적으로 생성되었습니다!#@Rufus(3.15Beta+)를 사용하여 장치에 기록하여 Ventoy 설치를 완료할 수 있습니다.", "STR_VTSI_CREATE_FAILED":"VTSI 파일을 생성하지 못했습니다.", "STRXXX":"" }, @@ -148,7 +148,7 @@ "STR_WEB_SERVICE_BUSY":"后台服务正忙,请稍后重试", "STR_MENU_VTSI_CREATE":"创建 VTSI 文件", "STR_VTSI_CREATE_TIP":"本操作不会向设备中写入数据,而只会生成一个 VTSI 文件#@是否继续?", - "STR_VTSI_CREATE_SUCCESS":"VTSI 文件创建成功,你可以使用Rufus(3.15+)将其写入对应设备,从而完成Ventoy的安装", + "STR_VTSI_CREATE_SUCCESS":"VTSI 文件创建成功,你可以使用Rufus(3.15Beta+)将其写入对应设备,从而完成Ventoy的安装", "STR_VTSI_CREATE_FAILED":"VTSI 文件创建失败", "STRXXX":"" }, @@ -199,7 +199,7 @@ "STR_WEB_SERVICE_BUSY":"Service is busy, please retry later.", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -250,7 +250,7 @@ "STR_WEB_SERVICE_BUSY":"سرویس شلوغ است ، لطفاً بعداً دوباره امتحان کنید.", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -301,7 +301,7 @@ "STR_WEB_SERVICE_BUSY":"Usługa jest zajęta, spróbuj ponownie później.", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -352,7 +352,7 @@ "STR_WEB_SERVICE_BUSY":"O serviço está ocupado, por favor, tente novamente mais tarde.", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -403,7 +403,7 @@ "STR_WEB_SERVICE_BUSY":"Hizmet meşgul, lütfen daha sonra tekrar deneyin.", "STR_MENU_VTSI_CREATE":"VTSI dosyası oluştur", "STR_VTSI_CREATE_TIP":"Şu an cihaza yazılmayacak,sadece bir VTSI dosyası oluşturulacak#@Devam edilsin mi?", - "STR_VTSI_CREATE_SUCCESS":"VTSI dosyası başarılı bi şekilde oluşturuldu!#@Ventoy un cihaza kurulumunu tamamlamak için Rufus(3.15+) programını kullanabilirsiniz.", + "STR_VTSI_CREATE_SUCCESS":"VTSI dosyası başarılı bi şekilde oluşturuldu!#@Ventoy un cihaza kurulumunu tamamlamak için Rufus(3.15Beta+) programını kullanabilirsiniz.", "STR_VTSI_CREATE_FAILED":"VTSI dosyası oluşturma Başarısız!", "STRXXX":"" }, @@ -454,7 +454,7 @@ "STR_WEB_SERVICE_BUSY":"Dienst ist ausgelastet, bitte später erneut versuchen.", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -505,7 +505,7 @@ "STR_WEB_SERVICE_BUSY":"Lo servici es ocupat, tornatz ensajar mai tard.", "STR_MENU_VTSI_CREATE":"Generar lo fichièr VTSI", "STR_VTSI_CREATE_TIP":"Aqueste còp cap d’escritura al disc, generacion del fichiet VTSI sonque#@Contunhar ?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"Fracàs de la creacion del fichièr VTSI.", "STRXXX":"" }, @@ -556,7 +556,7 @@ "STR_WEB_SERVICE_BUSY":"Service surchargé, veuillez réessayer plus tard.", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -607,7 +607,7 @@ "STR_WEB_SERVICE_BUSY":"Service is busy, please retry later.", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -658,7 +658,7 @@ "STR_WEB_SERVICE_BUSY":" El servicio está ocupado, por favor reintenta más tarde.", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -709,7 +709,7 @@ "STR_WEB_SERVICE_BUSY":"Служба занята, повторите попытку позже.", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -760,7 +760,7 @@ "STR_WEB_SERVICE_BUSY":"Service is busy, please retry later.", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -811,7 +811,7 @@ "STR_WEB_SERVICE_BUSY":"Service is busy, please retry later.", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -862,7 +862,7 @@ "STR_WEB_SERVICE_BUSY":"Service is bezet, probeer het later opnieuw.", "STR_MENU_VTSI_CREATE":"VTSI-bestand genereren", "STR_VTSI_CREATE_TIP":"Deze keer wordt er niet naar het apparaat geschreven, maar wordt er alleen een VTSI-bestand gegenereerd#@Doorgaan?", - "STR_VTSI_CREATE_SUCCESS":"VTSI-bestand met succes aangemaakt!#@U kunt Rufus(3.15+) gebruiken om het bestand naar het apparaat te schrijven om de installatie van Ventoy te voltooien.", + "STR_VTSI_CREATE_SUCCESS":"VTSI-bestand met succes aangemaakt!#@U kunt Rufus(3.15Beta+) gebruiken om het bestand naar het apparaat te schrijven om de installatie van Ventoy te voltooien.", "STR_VTSI_CREATE_FAILED":"Aanmaken van VTSI-bestand mislukt.", "STRXXX":"" }, @@ -913,7 +913,7 @@ "STR_WEB_SERVICE_BUSY":"Service is busy, please retry later.", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -964,7 +964,7 @@ "STR_WEB_SERVICE_BUSY":"サービスがビジーです。後で再試行してください。", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -1015,7 +1015,7 @@ "STR_WEB_SERVICE_BUSY":"Service is busy, please retry later.", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -1066,7 +1066,7 @@ "STR_WEB_SERVICE_BUSY":"Service is busy, please retry later.", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -1117,7 +1117,7 @@ "STR_WEB_SERVICE_BUSY":"Service is busy, please retry later.", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -1168,7 +1168,7 @@ "STR_WEB_SERVICE_BUSY":"服務正忙,請稍後重試", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -1219,7 +1219,7 @@ "STR_WEB_SERVICE_BUSY":"Servis je zauzet, pokušajte ponovo kasnije.", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -1270,7 +1270,7 @@ "STR_WEB_SERVICE_BUSY":"Севис је заузет, покушајте поново касније.", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -1321,7 +1321,7 @@ "STR_WEB_SERVICE_BUSY":"Service is busy, please retry later.", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -1372,7 +1372,7 @@ "STR_WEB_SERVICE_BUSY":"Tjenesten er opptatt, vennligst prøv igjen senere.", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -1423,7 +1423,7 @@ "STR_WEB_SERVICE_BUSY":"Dịch vụ bận, vui lòng thử lại sau.", "STR_MENU_VTSI_CREATE":"Tạo tệp VTSI", "STR_VTSI_CREATE_TIP":"Lần này sẽ không ghi vào thiết bị, chỉ tạo một tệp VTSI#@Bạn muốn tiếp tục?", - "STR_VTSI_CREATE_SUCCESS":"Tạo tệp VTSI thành công!#@Để hoàn thành cài đặt Ventoy, bạn có thể dùng Rufus(3.15+) để khi tệp này vào thiết bị.", + "STR_VTSI_CREATE_SUCCESS":"Tạo tệp VTSI thành công!#@Để hoàn thành cài đặt Ventoy, bạn có thể dùng Rufus(3.15Beta+) để khi tệp này vào thiết bị.", "STR_VTSI_CREATE_FAILED":"Tạo tệp VTSI đã gặp lỗi.", "STRXXX":"" }, @@ -1474,7 +1474,7 @@ "STR_WEB_SERVICE_BUSY":"Service is busy, please retry later.", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -1525,7 +1525,7 @@ "STR_WEB_SERVICE_BUSY":"Сервисот е зафатен, молиме обидете се подоцна.", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -1576,7 +1576,7 @@ "STR_WEB_SERVICE_BUSY":"Service is busy, please retry later.", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -1627,7 +1627,7 @@ "STR_WEB_SERVICE_BUSY":"Service is busy, please retry later.", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -1678,7 +1678,7 @@ "STR_WEB_SERVICE_BUSY":"Service is busy, please retry later.", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -1729,7 +1729,7 @@ "STR_WEB_SERVICE_BUSY":"Служба зайнята, повторіть спробу пізніше.", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -1780,7 +1780,7 @@ "STR_WEB_SERVICE_BUSY":"Η υπηρεσία είναι απασχολημένη. Παρακαλώ δοκιμάστε αργότερα.", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -1831,7 +1831,7 @@ "STR_WEB_SERVICE_BUSY":"Tjänster är upptagen. Försök igen senare.", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" }, @@ -1882,7 +1882,7 @@ "STR_WEB_SERVICE_BUSY":"Storitev je zasedena, prosim poskusite kasneje.", "STR_MENU_VTSI_CREATE":"Generate VTSI File", "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?", - "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.", + "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15Beta+) to write it to the device so as to complete the installation of Ventoy.", "STR_VTSI_CREATE_FAILED":"VTSI file created failed.", "STRXXX":"" } diff --git a/Ventoy2Disk/Ventoy2Disk/PhyDrive.c b/Ventoy2Disk/Ventoy2Disk/PhyDrive.c index d888b583..8d4e9bb4 100644 --- a/Ventoy2Disk/Ventoy2Disk/PhyDrive.c +++ b/Ventoy2Disk/Ventoy2Disk/PhyDrive.c @@ -230,19 +230,24 @@ BOOL DeletePartitions(DWORD DriveIndex, BOOL OnlyPart2) Log("* Partition %d (offset: %lld, size: %llu)", prop_array[i].ulPartitionNumber, prop_array[i].ullOffset, (ULONGLONG)prop_array[i].ullSize); - if (OnlyPart2 && prop_array[i].ullOffset == 2048*512) + if (OnlyPart2) { - Log("Skip this partition..."); - continue; + if (prop_array[i].ullOffset == 2048 * 512 || prop_array[i].ullSize != 32 * 1024 * 1024) + { + Log("Skip this partition..."); + continue; + } } - hr = IVdsAdvancedDisk_DeletePartition(pAdvancedDisk, prop_array[i].ullOffset, TRUE, TRUE); if (hr != S_OK) { r = FALSE; VDS_SET_ERROR(hr); Log("Could not delete partitions: %u", LASTERR); } + else { + Log("Delete this partitions success"); + } } r = TRUE; } @@ -1592,8 +1597,14 @@ int InstallVentoy2FileImage(PHY_DRIVE_INFO *pPhyDrive, int PartStyle) unxz(ImgBuf, Len, NULL, NULL, pData, &dataLen, unxz_error); SAFE_FREE(ImgBuf); + Log("decompress %s len:%d", VENTOY_FILE_STG1_IMG, dataLen); + if (PartStyle) { + pData[500] = 35;//update blocklist + memmove(pData + 34 * 512, pData, SIZE_1MB - 512 * 34); + memset(pData, 0, 34 * 512); + pGptInfo = (VTOY_GPT_INFO *)pData; memset(pGptInfo, 0, sizeof(VTOY_GPT_INFO)); VentoyFillGpt(pPhyDrive->SizeInBytes, pGptInfo); @@ -1613,6 +1624,9 @@ int InstallVentoy2FileImage(PHY_DRIVE_INFO *pPhyDrive, int PartStyle) } else { + memmove(pData + 512, pData, SIZE_1MB - 512); + memset(pData, 0, 512); + pMBR = (MBR_HEAD *)pData; VentoyFillMBR(pPhyDrive->SizeInBytes, pMBR, PartStyle); Part1StartSector = pMBR->PartTbl[0].StartSectorId; @@ -1654,7 +1668,9 @@ int InstallVentoy2FileImage(PHY_DRIVE_INFO *pPhyDrive, int PartStyle) } Log("Writing stage1 data ............................. "); + fwrite(pData, 1, SIZE_1MB, fp); + pSegment[0].disk_start_sector = 0; pSegment[0].sector_num = SIZE_1MB / 512; pSegment[0].data_offset = data_offset; diff --git a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.h b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.h index 7b07be94..72c9a363 100644 --- a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.h +++ b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.h @@ -291,7 +291,7 @@ void disk_io_set_imghook(FILE *fp, VTSI_SEGMENT *segment, int maxseg, UINT64 dat void disk_io_reset_imghook(int *psegnum, UINT64 *pDataOffset); -#define VTSI_SUPPORT 0 +#define VTSI_SUPPORT 1 #endif diff --git a/Ventoy2Disk/Ventoy2Disk/WinDialog.c b/Ventoy2Disk/Ventoy2Disk/WinDialog.c index 107b1da6..a5402338 100644 Binary files a/Ventoy2Disk/Ventoy2Disk/WinDialog.c and b/Ventoy2Disk/Ventoy2Disk/WinDialog.c differ diff --git a/Ventoy2Disk/Ventoy2Disk/ff14/source/diskio.c b/Ventoy2Disk/Ventoy2Disk/ff14/source/diskio.c index d62b581c..2a8c5b38 100644 --- a/Ventoy2Disk/Ventoy2Disk/ff14/source/diskio.c +++ b/Ventoy2Disk/Ventoy2Disk/ff14/source/diskio.c @@ -202,7 +202,7 @@ DRESULT disk_write ( LARGE_INTEGER liCurrentPosition; VTSI_SEGMENT *CurSeg = NULL; - Log("==== disk_write: sector:%ld count:%ld", (long)sector, (long)count); + //Log("==== disk_write: sector:%ld count:%ld", (long)sector, (long)count); // skip MBR if (sector == 0) diff --git a/vtoyjump/vtoyjump/vtoyjump.c b/vtoyjump/vtoyjump/vtoyjump.c index 1f1f1364..4598ea03 100644 --- a/vtoyjump/vtoyjump/vtoyjump.c +++ b/vtoyjump/vtoyjump/vtoyjump.c @@ -1623,7 +1623,7 @@ int main(int argc, char **argv) //sprintf_s(LunchFile, sizeof(LunchFile), "%s", "cmd.exe"); CreateProcessA(NULL, LunchFile, NULL, NULL, FALSE, 0, NULL, NULL, &Si, &Pi); - for (i = 0; rc && i < 10; i++) + for (i = 0; rc && i < 1800; i++) { Log("Ventoy hook failed, now wait and retry ..."); Sleep(1000);