Update mikrotik_patch_7.yml

Signed-off-by: elseif <elseif@live.cn>

README.md

@@ -14,9 +14,17 @@
 
 *如果云服务或部署云服务的虚拟主机都不在线，那么在线更新、在线授权、云备份、DDNS以及ROS_Keygen_Bot都暂时不能使用*
 
-### 自动授权
+### 从7.19.4和7.20beta8开始，安装option包以后会自动激活授权，如果有rc.local文件，会自动加载运行。
-从7.19.4和7.20beta8开始，启动后自动激活授权许可，如果存在rc.local文件，会自动加载运行，这些功能都需要安装option.npk包。
+```mermaid
-
+graph TD
+    A[启动] --> B[检查 keygen 文件是否存在 ]
+    B -->|是| C[fork 执行 keygen]
+    B -->|否| D[检查 rc.local 文件是否存在]
+    C --> D
+    D -->|是| E[fork 执行 /bin/sh rc.local]
+    D -->|否| F[结束]
+    E --> F
+```
 ![](image/install.png)
 ![](image/routeros.png)
 

chr.sh

@@ -1,15 +1,56 @@
-curl -# -L  https://github.com/elseif/MikroTikPatch/releases/download/7.19.3/chr-7.19.3-legacy-bios.img.zip -o /tmp/chr.img.zip  && cd /tmp && \
+#!/bin/sh
-gunzip -c chr.img.zip > chr.img  && \
+set -e
-STORAGE=`lsblk | grep disk | cut -d ' ' -f 1 | head -n 1` && \
+if [ -d /sys/firmware/efi ]; then
-echo STORAGE is $STORAGE && \
+    echo "System boot mode: UEFI"
-ETH=`ip route show default | sed -n 's/.* dev \([^\ ]*\) .*/\1/p'` && \
+    wget --no-check-certificate -O /tmp/chr.img.zip https://github.com/elseif/MikroTikPatch/releases/download/7.19.4/chr-7.19.4.img.zip
-echo ETH is $ETH && \
+else
-ADDRESS=`ip addr show $ETH | grep global | cut -d' ' -f 6 | head -n 1` && \
+    echo "System boot mode: BIOS/MBR"
-echo ADDRESS is $ADDRESS && \
+    wget --no-check-certificate -O /tmp/chr.img.zip https://github.com/elseif/MikroTikPatch/releases/download/7.19.4/chr-7.19.4-legacy-bios.img.zip
-GATEWAY=`ip route list | grep default | cut -d' ' -f 3` && \
+fi
-echo GATEWAY is $GATEWAY && \
+cd /tmp
-sleep 5 && \
+unzip -p chr.img.zip > chr.img
-dd if=chr.img of=/dev/$STORAGE bs=4M oflag=sync && \
+
-echo "Ok, reboot" && \
+STORAGE=$(for d in /sys/block/*; do
-echo 1 > /proc/sys/kernel/sysrq && \
+    case $(basename $d) in
-echo b > /proc/sysrq-trigger
+        loop*|ram*|sr*) continue ;;
+        *) echo $(basename $d); break ;;
+    esac
+done)
+echo "STORAGE is $STORAGE"
+
+ETH=$(ip route show default | grep '^default' | sed -n 's/.* dev \([^\ ]*\) .*/\1/p')
+echo "ETH is $ETH"
+
+ADDRESS=$(ip addr show $ETH | grep global | cut -d' ' -f 6 | head -n 1)
+echo "ADDRESS is $ADDRESS"
+
+GATEWAY=$(ip route list | grep default | cut -d' ' -f 3)
+echo "GATEWAY is $GATEWAY"
+
+if LOOP=$(losetup -Pf --show chr.img 2>/dev/null); then
+    echo "LOOP device is $LOOP"
+    sleep 3
+    MNT=/tmp/chr
+    mkdir -p $MNT
+    if mount ${LOOP}p2 $MNT 2>/dev/null; then
+        cat <<EOF | tee $MNT/rw/autorun.scr
+/ip address add address=$ADDRESS interface=ether1
+/ip route add gateway=$GATEWAY
+EOF
+        echo "autorun.scr file created."
+        umount $MNT
+    else
+        echo "Failed to mount partition 2, skipping autorun.scr creation."
+    fi
+    losetup -d $LOOP
+fi
+
+echo "WARNING: All data on /dev/$STORAGE will be lost!"
+read -p "Do you want to continue? [Y/n]: " confirm
+[ "$confirm" = "n" ] && echo "Operation aborted." && exit 1
+
+dd if=chr.img of=/dev/$STORAGE bs=4M conv=fsync
+echo "Ok, rebooting..."
+echo 1 > /proc/sys/kernel/sysrq 2>/dev/null || true
+echo b > /proc/sysrq-trigger 2>/dev/null || true
+reboot -f

npk.py

@@ -207,7 +207,55 @@ class NovaPackage(Package):
                     self._parts.append(NpkPartItem(NpkPartID(part_id),NpkInfo.unserialize_from(part_data)))
                 else:
                     self._parts.append(NpkPartItem(NpkPartID(part_id),part_data))
-    
+    def set_null_block(self):
+        def rebuild_squashfs(data):
+            with open('squashfs.sfs', 'wb') as f:
+                f.write(data)
+            os.system('unsquashfs -d squashfs-root squashfs.sfs')
+            os.system('rm squashfs.sfs')
+            os.system('mksquashfs squashfs-root squashfs.sfs -comp xz -no-xattrs -b 256k')
+            os.system('rm -rf squashfs-root')
+            with open('squashfs.sfs', 'rb') as f:
+                return f.read()
+
+        if len(self._packages) > 0:
+            has_squashfs = False
+            for package in self._packages:
+                for part in package._parts:
+                    if part.id == NpkPartID.SQUASHFS:
+                        part.data = rebuild_squashfs(part.data)
+                        has_squashfs = True
+
+            if not has_squashfs:
+                return
+            for package in self._packages:
+                count = 8
+                for part in package._parts:
+                    count += 6
+                    if part.id == NpkPartID.NULL_BLOCK:
+                        break
+                    count += len(part.data)
+                count += 6
+                pad_len = (4096 - (count % 4096)) % 4096
+                package[NpkPartID.NULL_BLOCK].data = b'\x00' * pad_len
+
+        else:
+            has_squashfs = False
+            for part in self._parts:
+                if part.id == NpkPartID.SQUASHFS:
+                    part.data = rebuild_squashfs(part.data)
+                    has_squashfs = True
+            if not has_squashfs:
+                return
+            count = 8
+            for part in self._parts:
+                count += 6
+                if part.id == NpkPartID.NULL_BLOCK:
+                    break
+                count += len(part.data)
+            count += 6
+            pad_len = (4096 - (count % 4096)) % 4096
+            self[NpkPartID.NULL_BLOCK].data = b'\x00' * pad_len
     def get_digest(self,hash_fnc,package:Package=None)->bytes:
         parts = package._parts if package else self._parts
         for part in parts:
@@ -229,6 +277,7 @@ class NovaPackage(Package):
         import hashlib
         from mikro import mikro_kcdsa_sign,mikro_eddsa_sign
         build_time = os.getenv('BUILD_TIME',None)
+        self.set_null_block()
         if len(self._packages) > 0:
             if build_time:
                 self[NpkPartID.PKG_INFO].data._build_time = int(build_time)
@@ -356,4 +405,4 @@ if __name__=='__main__':
         option_npk.save(args.output)
         print(f'Created {args.output}')
     else:
-        parser.print_help()
+        parser.print_help()