update CI build script

[Ventoy.git] / IMG / cpio / ventoy / hook / ventoy-hook-lib.sh

diff --git a/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh b/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh
index c182a5498b6c2744b1e64a855c572e868d4327a1..689b68c8d857169743f156890f36250f994239d5 100644 (file)
--- a/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh
+++ b/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh
@@ -29,7 +29,7 @@ SED=$BUSYBOX_PATH/sed
 SLEEP=$BUSYBOX_PATH/sleep
 HEAD=$BUSYBOX_PATH/head
 VTOY_DM_PATH=/dev/mapper/ventoy
 SLEEP=$BUSYBOX_PATH/sleep
 HEAD=$BUSYBOX_PATH/head
 VTOY_DM_PATH=/dev/mapper/ventoy

-VTOY_DEBUG_LEVEL=$($BUSYBOX_PATH/hexdump -n 1 -s 430 -e '1/1 "%02x"' $VTOY_PATH/ventoy_os_param)
+VTOY_DEBUG_LEVEL=$($BUSYBOX_PATH/hexdump -n 1 -s 450 -e '1/1 "%02x"' $VTOY_PATH/ventoy_os_param)

 
 if [ "$VTOY_DEBUG_LEVEL" = "01" ]; then
     if [ -e /dev/console ]; then
 
 if [ "$VTOY_DEBUG_LEVEL" = "01" ]; then
     if [ -e /dev/console ]; then


@@ -87,7 +87,13 @@ wait_for_usb_disk_ready() {
                usb_disk=$(get_ventoy_disk_name)
         vtlog "wait_for_usb_disk_ready $usb_disk ..."
         
                usb_disk=$(get_ventoy_disk_name)
         vtlog "wait_for_usb_disk_ready $usb_disk ..."
         

-               if [ -e "${usb_disk}2" ]; then
+        if echo $usb_disk | $EGREP -q "nvme|mmc"; then
+            vtpart2=${usb_disk}p2
+        else
+            vtpart2=${usb_disk}2
+        fi
+        
+        if [ -e "${vtpart2}" ]; then

             vtlog "wait_for_usb_disk_ready $usb_disk finish"
                        break
                else
             vtlog "wait_for_usb_disk_ready $usb_disk finish"
                        break
                else


@@ -96,6 +102,16 @@ wait_for_usb_disk_ready() {
        done
 }
 
        done
 }
 

+check_usb_disk_ready() {
+    if echo $1 | $EGREP -q "nvme|mmc"; then
+        vtpart2=${1}p2
+    else
+        vtpart2=${1}2
+    fi
+    
+    [ -e "${vtpart2}" ]
+}
+

 is_ventoy_disk() {
     if $VTOY_PATH/tool/vtoydump -f $VTOY_PATH/ventoy_os_param -c "$1"; then
         $BUSYBOX_PATH/true
 is_ventoy_disk() {
     if $VTOY_PATH/tool/vtoydump -f $VTOY_PATH/ventoy_os_param -c "$1"; then
         $BUSYBOX_PATH/true


@@ -105,7 +121,13 @@ is_ventoy_disk() {
 }
 
 not_ventoy_disk() {
 }
 
 not_ventoy_disk() {

-    if $VTOY_PATH/tool/vtoydump -f $VTOY_PATH/ventoy_os_param -c "$1"; then
+    if echo $1 | $EGREP -q "nvme.*p$|mmc.*p$"; then
+        vtDiskName=${1:0:-1}
+    else
+        vtDiskName=$1
+    fi
+
+    if $VTOY_PATH/tool/vtoydump -f $VTOY_PATH/ventoy_os_param -c "$vtDiskName"; then

         $BUSYBOX_PATH/false
     else
         $BUSYBOX_PATH/true
         $BUSYBOX_PATH/false
     else
         $BUSYBOX_PATH/true


@@ -215,6 +237,29 @@ create_ventoy_device_mapper() {
     fi    
 }
 
     fi    
 }
 

+create_persistent_device_mapper() {
+    vtlog "create_persistent_device_mapper $*"
+    
+    VT_DM_BIN=$(ventoy_find_bin_path dmsetup)
+    if [ -z "$VT_DM_BIN" ]; then
+        vtlog "no dmsetup avaliable, lastly try inbox dmsetup"
+        VT_DM_BIN=$VTOY_PATH/tool/dmsetup
+    fi
+    
+    vtlog "dmsetup avaliable in system $VT_DM_BIN"
+        
+    if ventoy_check_dm_module "$1"; then
+        vtlog "device-mapper module check success"
+    else
+        vterr "Error: no dm module avaliable"
+    fi
+    
+    $VTOY_PATH/tool/vtoydm -p -f $VTOY_PATH/ventoy_persistent_map -d $1 > $VTOY_PATH/persistent_dm_table        
+    $VT_DM_BIN create vtoy_persistent $VTOY_PATH/persistent_dm_table >>$VTLOG 2>&1
+}
+
+
+

 wait_for_ventoy_dm_disk_label() {
     DM=$($BUSYBOX_PATH/readlink $VTOY_DM_PATH)    
     vtlog "wait_for_ventoy_dm_disk_label $DM ..."
 wait_for_ventoy_dm_disk_label() {
     DM=$($BUSYBOX_PATH/readlink $VTOY_DM_PATH)    
     vtlog "wait_for_ventoy_dm_disk_label $DM ..."


@@ -226,7 +271,7 @@ wait_for_ventoy_dm_disk_label() {
         if ls -l /dev/disk/by-label/ | $GREP -q "$DM"; then
             break
         else
         if ls -l /dev/disk/by-label/ | $GREP -q "$DM"; then
             break
         else

-            $SLEEP 0.3
+            $SLEEP 1

         fi
     done
 }
         fi
     done
 }


@@ -320,6 +365,37 @@ extract_file_from_line() {
     fi
 }
 
     fi
 }
 

+extract_rpm_from_line() {
+    vtlog "extract_rpm_from_line $1 disk=#$2#"
+
+    if ! [ -b "$2" ]; then
+        vterr "disk #$2# not exist"
+        return 
+    fi
+
+    sector=$(echo $1 | $AWK '{print $(NF-1)}')
+    length=$(echo $1 | $AWK '{print $NF}')
+    vtlog "sector=$sector  length=$length"
+    
+    $VTOY_PATH/tool/vtoydm -e -f $VTOY_PATH/ventoy_image_map -d ${2} -s $sector -l $length -o /tmp/xxx.rpm
+    if [ -e /tmp/xxx.rpm ]; then
+        vtlog "extract rpm file from iso success"
+    else
+        vterr "extract rpm file from iso fail"
+        return
+    fi
+    
+    CURPWD=$($BUSYBOX_PATH/pwd)
+    
+    $BUSYBOX_PATH/mkdir -p $VTOY_PATH/rpm
+    cd $VTOY_PATH/rpm
+    vtlog "extract rpm..."
+    $BUSYBOX_PATH/rpm2cpio /tmp/xxx.rpm | $BUSYBOX_PATH/cpio -idm 2>>$VTLOG
+    cd $CURPWD
+    
+    $BUSYBOX_PATH/rm -f /tmp/xxx.rpm 
+}
+

 install_rpm_from_line() {
     vtlog "install_rpm_from_line $1 disk=#$2#"
 
 install_rpm_from_line() {
     vtlog "install_rpm_from_line $1 disk=#$2#"
 


@@ -385,17 +461,50 @@ ventoy_copy_device_mapper() {
     fi 
 }
 
     fi 
 }
 

-ventoy_udev_disk_common_hook() {
+# create link for device-mapper
+ventoy_create_persistent_link() {
+    blkdev_num=$($VTOY_PATH/tool/dmsetup ls | grep vtoy_persistent | sed 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1:\2/')  
+    vtDM=$(ventoy_find_dm_id ${blkdev_num})
+
+    if ! [ -d /dev/disk/by-label ]; then
+        mkdir -p /dev/disk/by-label
+    fi
+
+    VTLABEL=$($BUSYBOX_PATH/blkid /dev/$vtDM | $SED 's/.*LABEL="\([^"]*\)".*/\1/')
+    if [ -z "$VTLABEL" ]; then
+        VTLABEL=casper-rw
+    fi
+
+    vtlog "Persistent Label: ##${VTLABEL}##"
+
+    if ! [ -e /dev/disk/by-label/$VTLABEL ]; then
+        vtOldDir=$PWD
+        cd /dev/disk/by-label
+        ln -s ../../$vtDM $VTLABEL
+        cd $vtOldDir
+    fi    
+}
+
+ventoy_udev_disk_common_hook() {    
+    if echo $1 | $EGREP -q "nvme.*p[0-9]$|mmc.*p[0-9]$"; then
+        VTDISK="${1:0:-2}"    
+    else
+        VTDISK="${1:0:-1}"
+    fi

     
     

-    VTDISK="${1:0:-1}"
+    if [ -e /vtoy/vtoy ]; then
+        VTRWMOD=""
+    else
+        VTRWMOD="--readonly"
+    fi

     
     # create device mapper for iso image file
     
     # create device mapper for iso image file

-    if create_ventoy_device_mapper "/dev/$VTDISK" --readonly; then
+    if create_ventoy_device_mapper "/dev/$VTDISK" $VTRWMOD; then

         vtlog "==== create ventoy device mapper success ===="
     else
         vtlog "==== create ventoy device mapper failed ===="
         
         vtlog "==== create ventoy device mapper success ===="
     else
         vtlog "==== create ventoy device mapper failed ===="
         

-        $SLEEP 5
+        $SLEEP 3

         
         if $GREP -q "/dev/$VTDISK" /proc/mounts; then
             $GREP "/dev/$VTDISK" /proc/mounts | while read vtLine; do
         
         if $GREP -q "/dev/$VTDISK" /proc/mounts; then
             $GREP "/dev/$VTDISK" /proc/mounts | while read vtLine; do


@@ -406,7 +515,7 @@ ventoy_udev_disk_common_hook() {
             done
         fi
         
             done
         fi
         

-        if create_ventoy_device_mapper "/dev/$VTDISK" --readonly; then
+        if create_ventoy_device_mapper "/dev/$VTDISK" $VTRWMOD; then

             vtlog "==== create ventoy device mapper success after retry ===="
         else
             vtlog "==== create ventoy device mapper failed after retry ===="
             vtlog "==== create ventoy device mapper success after retry ===="
         else
             vtlog "==== create ventoy device mapper failed after retry ===="


@@ -419,6 +528,85 @@ ventoy_udev_disk_common_hook() {
     else
         ventoy_copy_device_mapper "/dev/$1"
     fi
     else
         ventoy_copy_device_mapper "/dev/$1"
     fi

+    
+    if [ -f $VTOY_PATH/ventoy_persistent_map ]; then
+        create_persistent_device_mapper "/dev/$VTDISK"
+        ventoy_create_persistent_link
+    fi
+}
+
+ventoy_create_dev_ventoy_part() {   
+    blkdev_num=$($VTOY_PATH/tool/dmsetup ls | $GREP ventoy | $SED 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1 \2/')
+    $BUSYBOX_PATH/mknod -m 0666 /dev/ventoy b $blkdev_num
+    
+    if [ -e /vtoy_dm_table ]; then
+        vtPartid=1
+        
+        $CAT /vtoy_dm_table | while read vtline; do
+            echo $vtline > /ventoy/dm_table_part${vtPartid}
+            $VTOY_PATH/tool/dmsetup create ventoy${vtPartid} /ventoy/dm_table_part${vtPartid}
+            
+            blkdev_num=$($VTOY_PATH/tool/dmsetup ls | $GREP ventoy${vtPartid} | $SED 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1 \2/')
+            $BUSYBOX_PATH/mknod -m 0666 /dev/ventoy${vtPartid} b $blkdev_num
+            
+            vtPartid=$(expr $vtPartid + 1)
+        done        
+    fi
+}
+
+is_inotify_ventoy_part() {
+    if echo $1 | $GREP -q "2$"; then
+        if ! [ -e /sys/block/$1 ]; then
+            if [ -e /sys/class/block/$1 ]; then
+                if echo $1 | $EGREP -q "nvme|mmc"; then
+                    vtShortName=${1:0:-2}
+                else
+                    vtShortName=${1:0:-1}
+                fi
+                
+                if [ -e /dev/$vtShortName ]; then
+                    $VTOY_PATH/tool/vtoydump -f $VTOY_PATH/ventoy_os_param -c $vtShortName
+                    return
+                fi
+            fi
+        fi
+    fi
+    
+    [ "1" = "0" ]

 }
 
 }
 

+ventoy_find_dm_id() {
+    for vt in $($BUSYBOX_PATH/ls /sys/block/); do
+        if [ "${vt:0:3}" = "dm-" ]; then
+            vtMajorMinor=$($CAT /sys/block/$vt/dev)
+            if [ "$vtMajorMinor" = "$1" ]; then
+                echo ${vt}
+                return
+            fi
+        fi
+    done
+    echo 'xx'
+}

 
 

+ventoy_swap_device() {
+    mv $1 $VTOY_PATH/swap_tmp_dev
+    mv $2 $1
+    mv $VTOY_PATH/swap_tmp_dev $2
+}
+
+ventoy_extract_vtloopex() {
+    vtCurPwd=$PWD
+    $BUSYBOX_PATH/mkdir -p $VTOY_PATH/partmnt $VTOY_PATH/vtloopex
+    $BUSYBOX_PATH/mount -o ro -t vfat $1  $VTOY_PATH/partmnt
+    cd $VTOY_PATH/vtloopex
+    $CAT $VTOY_PATH/partmnt/ventoy/vtloopex.cpio | $BUSYBOX_PATH/cpio -idm >> $VTLOG 2>&1
+    $BUSYBOX_PATH/umount $VTOY_PATH/partmnt
+    $BUSYBOX_PATH/rm -rf $VTOY_PATH/partmnt    
+
+    if [ -n "$2" ]; then
+        cd $VTOY_PATH/vtloopex/$2/
+        $BUSYBOX_PATH/tar -xJf vtloopex.tar.xz
+    fi
+    
+    cd $vtCurPwd
+}