Update mikrotik_patch_6.yml

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

.github/workflows/mikrotik_patch_6.yml

@@ -212,8 +212,8 @@ jobs:
         fi
         sudo cp -f system-$LATEST_VERSION.npk ./new_iso/
         sudo -E python3 patch.py kernel ./new_iso/isolinux/initrd.rgz
-        # sudo -E python3 npk.py create ./new_iso/gps-$LATEST_VERSION.npk ./option-$LATEST_VERSION.npk option ./option.sfs -desc="busybox"
-        # sudo cp option-$LATEST_VERSION.npk ./new_iso/
+        sudo -E python3 npk.py create ./new_iso/gps-$LATEST_VERSION.npk ./option-$LATEST_VERSION.npk option ./option.sfs -desc="busybox"
+        sudo cp option-$LATEST_VERSION.npk ./new_iso/
         sudo mkisofs -o mikrotik-$LATEST_VERSION.iso \
                     -V "MikroTik $LATEST_VERSION" \
                     -sysid "" -preparer "MiKroTiK" \
@@ -291,8 +291,10 @@ jobs:
         sudo cp ./all_packages/dude-$LATEST_VERSION.npk ./chr/var/pdb/dude/image
         sudo -E python3 patch.py npk ./chr/var/pdb/routeros-x86/image
         sudo cp ./chr/var/pdb/routeros-x86/image ./all_packages/routeros-x86-$LATEST_VERSION.npk
-        # sudo mkdir -p ./chr/var/pdb/option
-        # sudo cp ./all_packages/option-$LATEST_VERSION.npk ./chr/var/pdb/option/image
+        sudo mkdir -p ./chr/var/pdb/option
+        sudo cp ./all_packages/option-$LATEST_VERSION.npk ./chr/var/pdb/option/image
+        sudo mkdir -p ./chr/rw/disk
+        echo -e '#!/bin/sh\n# This script will be executed *before* RouterOS *loader* start.\n# You can put your own initialization stuff in here\n' | sudo tee ./chr/rw/disk/rc.local
         sudo umount ./chr
         sudo qemu-nbd -d /dev/nbd0
         sudo rm -rf ./chr

chr.sh

@@ -3,26 +3,41 @@ set -e
 LATEST_VERSION="${1:-7.19.4}"
 echo "VERSION: $LATEST_VERSION"
 ARCH=$(uname -m)
-case $ARCH in
-    x86_64|i386|i486|i586|i686)
-        echo "ARCH: $ARCH"
-        if [ -d /sys/firmware/efi ]; then
-            echo "BOOT MODE: UEFI"
+
+if [[ $LATEST_VERSION == 7.* ]]; then
+    case $ARCH in
+        x86_64|i386|i486|i586|i686)
+            echo "ARCH: $ARCH"
+            if [ -d /sys/firmware/efi ]; then
+                echo "BOOT MODE: UEFI"
+                IMG_URL="https://github.com/elseif/MikroTikPatch/releases/download/$LATEST_VERSION/chr-$LATEST_VERSION.img.zip"
+            else
+                echo "BOOT MODE: BIOS/MBR"
+                IMG_URL="https://github.com/elseif/MikroTikPatch/releases/download/$LATEST_VERSION/chr-$LATEST_VERSION-legacy-bios.img.zip"
+            fi
+            ;; 
+        aarch64)
+             echo "ARCH: $ARCH"
+             IMG_URL="https://github.com/elseif/MikroTikPatch/releases/download/$LATEST_VERSION-arm64/chr-$LATEST_VERSION-arm64.img.zip"
+            ;; 
+        *)
+            echo "Unsupported architecture: $ARCH"
+            exit 1
+            ;;
+    esac
+else
+    case $ARCH in
+        x86_64|i386|i486|i586|i686)
+            echo "ARCH: $ARCH"
             IMG_URL="https://github.com/elseif/MikroTikPatch/releases/download/$LATEST_VERSION/chr-$LATEST_VERSION.img.zip"
-        else
-            echo "BOOT MODE: BIOS/MBR"
-            IMG_URL="https://github.com/elseif/MikroTikPatch/releases/download/$LATEST_VERSION/chr-$LATEST_VERSION-legacy-bios.img.zip"
-        fi
-        ;; 
-    aarch64)
-         echo "ARCH: $ARCH"
-         IMG_URL="https://github.com/elseif/MikroTikPatch/releases/download/$LATEST_VERSION-arm64/chr-$LATEST_VERSION-arm64.img.zip"
-        ;; 
-    *)
-        echo "Unsupported architecture: $ARCH"
-        exit 1
-        ;;
-esac
+            ;; 
+        *)
+            echo "Unsupported architecture: $ARCH"
+            exit 1
+            ;;
+    esac
+fi
+
 STORAGE=$(lsblk -d -n -o NAME,TYPE | awk '$2=="disk"{print $1; exit}')
 echo "STORAGE: $STORAGE"
 ETH=$(ip route show default | grep '^default' | sed -n 's/.* dev \([^\ ]*\) .*/\1/p')

npk.py

@@ -207,10 +207,9 @@ 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):
-            if len(part.data) < 4 or part.data[:4] != b'hsqs':
-                return part.data
             with open('squashfs.sfs', 'wb') as f:
                 f.write(data)
             os.system('unsquashfs -d squashfs-root squashfs.sfs')
@@ -219,19 +218,20 @@ class NovaPackage(Package):
             os.system('rm -rf squashfs-root')
             with open('squashfs.sfs', 'rb') as f:
                 return f.read()
-
-        if len(self._packages) > 0:
+        def get_size(package,size):
+            for part in package._parts:
+                size += 6
+                size += len(part.data)
+            return size
+           
+        def set_null(package,offset):
             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:
+                if part.id == NpkPartID.SQUASHFS and len(part.data) >= 4 and  part.data[:4] in [b'hsqs',b'sqsh']:
+                    part.data = rebuild_squashfs(part.data)
+                    has_squashfs = True
+            if has_squashfs:
+                count = offset
                 for part in package._parts:
                     count += 6
                     if part.id == NpkPartID.NULL_BLOCK:
@@ -241,23 +241,12 @@ class NovaPackage(Package):
                 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
+        set_null(self,8)
+        offset = get_size(self,8)
+        for package in self._packages:
+            set_null(package,offset)
+            offset += get_size(package,0)
+            
     def get_digest(self,hash_fnc,package:Package=None)->bytes:
         parts = package._parts if package else self._parts
         for part in parts: