change ntldr --> NTLDR

[Ventoy.git] / INSTALL / ventoy_pack.sh

diff --git a/INSTALL/ventoy_pack.sh b/INSTALL/ventoy_pack.sh
index 8969e4823ce7905c57c244967143380e8d26d6f1..988d4e13d2ec972f4ebf25207b9d42421a5b0b30 100644 (file)
--- a/INSTALL/ventoy_pack.sh
+++ b/INSTALL/ventoy_pack.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 
 #!/bin/sh
 

+dos2unix -q ./tool/ventoy_lib.sh
+dos2unix -q ./tool/VentoyWorker.sh
+

 . ./tool/ventoy_lib.sh
 
 GRUB_DIR=../GRUB2/INSTALL
 . ./tool/ventoy_lib.sh
 
 GRUB_DIR=../GRUB2/INSTALL


@@ -28,7 +31,7 @@ while ! grep -q 524288 /sys/block/${LOOP#/dev/}/size 2>/dev/null; do
     sleep 1
 done
 
     sleep 1
 done
 

-format_ventoy_disk $LOOP 
+format_ventoy_disk_mbr 0 $LOOP fdisk

 
 $GRUB_DIR/sbin/grub-bios-setup  --skip-fs-probe  --directory="./grub/i386-pc"  $LOOP
 
 
 $GRUB_DIR/sbin/grub-bios-setup  --skip-fs-probe  --directory="./grub/i386-pc"  $LOOP
 


@@ -74,8 +77,11 @@ dd if=$LOOP of=$tmpdir/boot/core.img bs=512 count=2047 skip=1 status=none
 xz --check=crc32 $tmpdir/boot/core.img
 
 cp -a ./tool $tmpdir/
 xz --check=crc32 $tmpdir/boot/core.img
 
 cp -a ./tool $tmpdir/

+rm -f $tmpdir/ENROLL_THIS_KEY_IN_MOKMANAGER.cer

 cp -a Ventoy2Disk.sh $tmpdir/
 cp -a Ventoy2Disk.sh $tmpdir/

-
+cp -a CreatePersistentImg.sh $tmpdir/
+dos2unix -q $tmpdir/Ventoy2Disk.sh
+dos2unix -q $tmpdir/CreatePersistentImg.sh

 
 #32MB disk img
 dd status=none if=$LOOP of=$tmpdir/ventoy/ventoy.disk.img bs=512 count=$VENTOY_SECTOR_NUM skip=$part2_start_sector
 
 #32MB disk img
 dd status=none if=$LOOP of=$tmpdir/ventoy/ventoy.disk.img bs=512 count=$VENTOY_SECTOR_NUM skip=$part2_start_sector


@@ -99,7 +105,7 @@ cd $CurDir
 tar -czvf ventoy-${curver}-linux.tar.gz $tmpdir
 
 rm -f ventoy-${curver}-windows.zip
 tar -czvf ventoy-${curver}-linux.tar.gz $tmpdir
 
 rm -f ventoy-${curver}-windows.zip

-cp -a Ventoy2Disk.exe $tmpdir/
+cp -a Ventoy2Disk*.exe $tmpdir/

 cp -a $LANG_DIR/languages.ini $tmpdir/ventoy/
 rm -rf $tmpdir/tool
 rm -f $tmpdir/*.sh
 cp -a $LANG_DIR/languages.ini $tmpdir/ventoy/
 rm -rf $tmpdir/tool
 rm -f $tmpdir/*.sh


@@ -116,4 +122,5 @@ else
     exit 1
 fi
 
     exit 1
 fi
 

+rm -f log.txt