update ventoy_pack.sh

[Ventoy.git] / INSTALL / tool / ventoy_lib.sh

diff --git a/INSTALL/tool/ventoy_lib.sh b/INSTALL/tool/ventoy_lib.sh
index 3562927c8b2e15853bd1308173cad8333810de3f..69d3e1eea373576231b68a2f671774f104b48043 100644 (file)
--- a/INSTALL/tool/ventoy_lib.sh
+++ b/INSTALL/tool/ventoy_lib.sh
@@ -14,16 +14,6 @@ ventoy_true() {
 }
 
 ventoy_is_linux64() {
 }
 
 ventoy_is_linux64() {

-    if [ -e /lib64 ]; then
-        ventoy_true
-        return
-    fi
-    
-    if [ -e /usr/lib64 ]; then
-        ventoy_true
-        return
-    fi
-    

     if uname -a | egrep -q 'x86_64|amd64'; then
         ventoy_true
         return
     if uname -a | egrep -q 'x86_64|amd64'; then
         ventoy_true
         return


@@ -32,40 +22,17 @@ ventoy_is_linux64() {
     ventoy_false
 }
 
     ventoy_false
 }
 

-ventoy_is_dash() {
-    if [ -L /bin/sh ]; then
-        vtdst=$(readlink /bin/sh)
-        if [ "$vtdst" = "dash" ]; then
-            ventoy_true
-            return
-        fi
-    fi 
-    ventoy_false
-}
-

 vtinfo() {
 vtinfo() {

-    if ventoy_is_dash; then
-        echo "\033[32m$*\033[0m"
-    else
-        echo -e "\033[32m$*\033[0m"
-    fi
+    echo -e "\033[32m$*\033[0m"

 }
 
 vtwarn() {
 }
 
 vtwarn() {

-    if ventoy_is_dash; then
-        echo "\033[33m$*\033[0m"
-    else
-        echo -e "\033[33m$*\033[0m"
-    fi
+    echo -e "\033[33m$*\033[0m"

 }
 
 
 vterr() {
 }
 
 
 vterr() {

-    if ventoy_is_dash; then
-        echo "\033[31m$*\033[0m"
-    else
-        echo -e "\033[31m$*\033[0m"
-    fi
+    echo -e "\033[31m$*\033[0m"

 }
 
 vtdebug() {
 }
 
 vtdebug() {


@@ -165,12 +132,12 @@ is_disk_contains_ventoy() {
         return
     fi
     
         return
     fi
     

-    PART1_TYPE=$(dd if=$DISK bs=1 count=1 skip=450 status=none | ./tool/hexdump -n1 -e  '1/1 "%02X"')
-    if [ "$PART1_TYPE" != "07" ]; then
-        vtdebug "part1 type is $PART2_TYPE not 07"
-        ventoy_false
-        return
-    fi
+    # PART1_TYPE=$(dd if=$DISK bs=1 count=1 skip=450 status=none | ./tool/hexdump -n1 -e  '1/1 "%02X"')
+    # if [ "$PART1_TYPE" != "07" ]; then
+        # vtdebug "part1 type is $PART2_TYPE not 07"
+        # ventoy_false
+        # return
+    # fi

     
     if [ -e /sys/class/block/${PART1#/dev/}/start ]; then
         PART1_START=$(cat /sys/class/block/${PART1#/dev/}/start)
     
     if [ -e /sys/class/block/${PART1#/dev/}/start ]; then
         PART1_START=$(cat /sys/class/block/${PART1#/dev/}/start)


@@ -217,9 +184,9 @@ get_disk_ventoy_version() {
     ventoy_false
 }
 
     ventoy_false
 }
 

-

 format_ventoy_disk() {
     DISK=$1
 format_ventoy_disk() {
     DISK=$1

+    PART1=$(get_disk_part_name $DISK 1)

     PART2=$(get_disk_part_name $DISK 2)
     
     sector_num=$(cat /sys/block/${DISK#/dev/}/size)
     PART2=$(get_disk_part_name $DISK 2)
     
     sector_num=$(cat /sys/block/${DISK#/dev/}/size)


@@ -229,15 +196,30 @@ format_ventoy_disk() {
     export part2_start_sector=$(expr $part1_end_sector + 1)
     part2_end_sector=$(expr $sector_num - 1)
 
     export part2_start_sector=$(expr $part1_end_sector + 1)
     part2_end_sector=$(expr $sector_num - 1)
 

+    vtdebug "part1_start_sector=$part1_start_sector  part1_end_sector=$part1_end_sector"
+    vtdebug "part2_start_sector=$part2_start_sector  part2_end_sector=$part2_end_sector"
+

     if [ -e $PART2 ]; then
         echo "delete $PART2"
         rm -f $PART2
     fi
 
     echo ""
     if [ -e $PART2 ]; then
         echo "delete $PART2"
         rm -f $PART2
     fi
 
     echo ""

-    echo "Create partitions on $DISK ..."
+    echo "Create partitions on $DISK by $2 ..."
+    
+    if [ "$2" = "parted" ]; then
+        vtdebug "format disk by parted ..."
+        parted -a none --script $DISK \
+            mklabel msdos \
+            unit s \
+            mkpart primary ntfs $part1_start_sector $part1_end_sector \
+            mkpart primary fat16 $part2_start_sector $part2_end_sector \
+            set 2 boot on \
+            quit
+    else
+    vtdebug "format disk by fdisk ..."

     
     

-fdisk $DISK >/dev/null 2>&1 <<EOF
+fdisk $DISK >>./log.txt 2>&1 <<EOF

 o
 n
 p
 o
 n
 p


@@ -259,19 +241,39 @@ a
 2
 w
 EOF
 2
 w
 EOF

-    
+    fi
+   

     echo "Done"
     udevadm trigger >/dev/null 2>&1
     partprobe >/dev/null 2>&1
     sleep 3
 
     echo "Done"
     udevadm trigger >/dev/null 2>&1
     partprobe >/dev/null 2>&1
     sleep 3
 

-

     echo 'mkfs on disk partitions ...'
     echo 'mkfs on disk partitions ...'

-    while ! [ -e $PART2 ]; do
-        echo "wait $PART2 ..."
-        sleep 1
+    for i in 1 2 3 4 5 6 7; do
+        if [ -b $PART2 ]; then
+            break
+        else
+            echo "wait $PART2 ..."
+            sleep 1
+        fi

     done
 
     done
 

+    if [ "$2" = "parted" ]; then
+        echo -en '\xEF' | dd of=$DISK conv=fsync bs=1 count=1 seek=466
+    fi
+
+    if ! [ -b $PART2 ]; then
+        MajorMinor=$(sed "s/:/ /" /sys/class/block/${PART2#/dev/}/dev)        
+        echo "mknod -m 0660 $PART2 b $MajorMinor ..."
+        mknod -m 0660 $PART2 b $MajorMinor
+        
+        if ! [ -b $PART1 ]; then
+            MajorMinor=$(sed "s/:/ /" /sys/class/block/${PART1#/dev/}/dev)        
+            echo "mknod -m 0660 $PART1 b $MajorMinor ..."
+            mknod -m 0660 $PART1 b $MajorMinor
+        fi
+    fi
+

     echo "create efi fat fs ..."
     for i in 0 1 2 3 4 5 6 7 8 9; do
         if mkfs.vfat -F 16 -n EFI $PART2; then
     echo "create efi fat fs ..."
     for i in 0 1 2 3 4 5 6 7 8 9; do
         if mkfs.vfat -F 16 -n EFI $PART2; then