modified: .github/workflows/patch_v7.yml

modified:   setup-routeros.sh

.github/workflows/build_docker.yml

@@ -7,14 +7,19 @@ on:
         required: false
         default: ''
         type: string
-        
+      force:
+        description: "Force rebuild even if version already exists"
+        required: false
+        default: false
+        type: boolean
+
 permissions:
   packages: write
 jobs:
   Prepare:
     runs-on: ubuntu-24.04
     outputs:
-      MATRIX: ${{ steps.get_versions.outputs.MATRIX }}
+      MATRIX: ${{ steps.filter_matrix.outputs.MATRIX }}
     steps:
       - name: Get versions and generate matrix
         id: get_versions
@@ -51,13 +56,53 @@ jobs:
           echo "Generated matrix: $MATRIX"
           echo "MATRIX=$MATRIX" >> $GITHUB_OUTPUT
 
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v4
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Filter already-published versions from matrix
+        id: filter_matrix
+        env:
+          IMAGE: "ghcr.io/${{ github.repository_owner }}/chr"
+          FORCE: ${{ github.event.inputs.force == 'true' }}
+        run: |
+          MATRIX='${{ steps.get_versions.outputs.MATRIX }}'
+          if [ "$FORCE" = "true" ]; then
+            echo "Force mode enabled, skipping version existence check."
+            FILTERED="$MATRIX"
+          else
+            FILTERED='[]'
+            while read -r row; do
+              VERSION=$(echo "$row" | jq -r '.version')
+              CHANNEL=$(echo "$row" | jq -r '.channel')
+
+              set +e
+              docker manifest inspect "${IMAGE}:${VERSION}" >/dev/null 2>&1
+              RET=$?
+              set -e
+
+              if [ "$RET" -eq 0 ]; then
+                echo "Skipping already published version: ${VERSION}"
+              else
+                FILTERED=$(echo "$FILTERED" | jq -c --arg VERSION "$VERSION" --arg CHANNEL "$CHANNEL" '. + [{"version": $VERSION, "channel": $CHANNEL}]')
+              fi
+            done < <(echo "$MATRIX" | jq -c '.[]')
+          fi
+
+          echo "Filtered matrix: $FILTERED"
+          echo "MATRIX=$FILTERED" >> "$GITHUB_OUTPUT"
+
   Build:
+    if: needs.Prepare.outputs.MATRIX != '[]'
     runs-on: ubuntu-24.04
     needs: Prepare
     strategy:
       max-parallel: 1
       matrix:
-        include: ${{ fromJson(needs.Prepare.outputs.MATRIX) }}
+        include: ${{ fromJson(needs.Prepare.outputs.MATRIX != '[]' && needs.Prepare.outputs.MATRIX || '[{"version":"__NO_BUILD__","channel":""}]') }}
     env:
       TZ: 'Asia/Shanghai'
       VERSION: ${{ matrix.version }}
@@ -72,13 +117,21 @@ jobs:
           echo "Version: ${{ env.VERSION }}"
           echo "Channel: ${{ env.CHANNEL }}"
 
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v4
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Download CHR image
         run: |
           # x86 架构
           mkdir -p "amd64"
           wget -nv -O "amd64/chr-$VERSION.img.zip" \
-            "https://github.com/elseif/MikroTikPatch/releases/download/$VERSION/chr-$VERSION.img.zip"
+            "https://github.com/elseif/MikroTikPatch/releases/download/$VERSION/chr-$VERSION-legacy-bios.img.zip"
           unzip "amd64/chr-$VERSION.img.zip" -d "amd64/"
+          mv "amd64/chr-$VERSION-legacy-bios.img" "amd64/chr.img"
           rm "amd64/chr-$VERSION.img.zip"
 
           # arm64 架构
@@ -86,6 +139,7 @@ jobs:
           wget -nv -O "arm64/chr-$VERSION-arm64.img.zip" \
             "https://github.com/elseif/MikroTikPatch/releases/download/$VERSION-arm64/chr-$VERSION-arm64.img.zip"
           unzip "arm64/chr-$VERSION-arm64.img.zip" -d "arm64/"
+          mv "arm64/chr-$VERSION-arm64.img" "arm64/chr.img"
           rm "arm64/chr-$VERSION-arm64.img.zip"
           
           ls -la amd64/ arm64/
@@ -185,13 +239,6 @@ jobs:
           ENTRYPOINT ["/start.sh"]
           EOF
 
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v4
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v4
 

.github/workflows/main.yml

@@ -2,7 +2,7 @@
 name: Patch Mikrotik RouterOS
 on:
   schedule:
-    - cron: "00 10 * * *"   # At UTC 10:00 (Beijing 18:00) on every day
+    - cron: "00 09 * * *"   # At UTC 09:00 (Beijing 17:00) on every day
   workflow_dispatch:  
     inputs:
       version:
@@ -35,25 +35,25 @@ jobs:
       release: true
     secrets: inherit
 
-  Patch_Testing_V7:
+  # Patch_Testing_V7:
-    if: |
+  #   if: |
-      (github.event_name == 'schedule') || 
+  #     (github.event_name == 'schedule') || 
-      (github.event_name == 'workflow_dispatch' && (github.event.inputs.version == 'all' || github.event.inputs.version == 'v7'))
+  #     (github.event_name == 'workflow_dispatch' && (github.event.inputs.version == 'all' || github.event.inputs.version == 'v7'))
-    uses: ./.github/workflows/patch_v7.yml
+  #   uses: ./.github/workflows/patch_v7.yml
-    with:
+  #   with:
-      channel: testing
+  #     channel: testing
-      release: true
+  #     release: true
-    secrets: inherit
+  #   secrets: inherit
     
-  Patch_Development_V7:
+  # Patch_Development_V7:
-    if: |
+  #   if: |
-      (github.event_name == 'schedule') || 
+  #     (github.event_name == 'schedule') || 
-      (github.event_name == 'workflow_dispatch' && (github.event.inputs.version == 'all' || github.event.inputs.version == 'v7'))
+  #     (github.event_name == 'workflow_dispatch' && (github.event.inputs.version == 'all' || github.event.inputs.version == 'v7'))
-    uses: ./.github/workflows/patch_v7.yml
+  #   uses: ./.github/workflows/patch_v7.yml
-    with:
+  #   with:
-      channel: development
+  #     channel: development
-      release: true
+  #     release: true
-    secrets: inherit
+  #   secrets: inherit
     
   Patch_Stable_V6:
     if: |

.github/workflows/patch_v7.yml

@@ -10,8 +10,8 @@ on:
         options:
         - stable
         - long-term
-        - testing
+        # - testing
-        - development
+        # - development
       arch:
         description: 'Architecture (x86, arm64)'
         required: true
@@ -181,7 +181,7 @@ jobs:
         echo "PACKAGES=$PACKAGES" >> $GITHUB_ENV
         echo "PACKAGES: $PACKAGES"
 
-    - name: Create Squashfs for Option and Python Package
+    - name: Build Squashfs for Option and Python Package
       run: |
         echo "Creating Option Package Squashfs for channel: $CHANNEL, arch: $ARCH"
         mkdir -p $BUILD_DIR/option-root/bin/
@@ -378,7 +378,116 @@ jobs:
       if: matrix.arch == 'x86' && steps.cache-refind.outputs.cache-hit != 'true'
       run: wget -nv -O $BUILD_DIR/refind-bin-0.14.2.zip https://downloads.sourceforge.net/project/refind/0.14.2/refind-bin-0.14.2.zip
 
-    - name: Create ISO & INSTALL image files
+    - name: Build Alpine LiveCD
+      if: matrix.arch == 'x86'
+      run: |
+        set -e
+        YAML_URL="https://dl-cdn.alpinelinux.org/alpine/latest-stable/releases/x86_64/latest-releases.yaml"
+        ROOTFS_FILE=$(curl -sL "$YAML_URL" | grep -m1 'alpine-minirootfs.*\.tar\.gz' | awk '{print $NF}' | tr -d '"')
+        echo "$ROOTFS_FILE"
+        ROOTFS_URL="https://dl-cdn.alpinelinux.org/alpine/latest-stable/releases/x86_64/$ROOTFS_FILE"
+        ROOTFS_DIR=$BUILD_DIR/rootfs
+        mkdir -p $ROOTFS_DIR
+        curl -# -L "$ROOTFS_URL" | tar -xzC $ROOTFS_DIR
+
+        sudo mount -v --bind /dev $ROOTFS_DIR/dev
+        sudo mount -vt sysfs sysfs $ROOTFS_DIR/sys
+        sudo mount -vt proc proc $ROOTFS_DIR/proc
+
+        cat << 'EOF' > $ROOTFS_DIR/etc/network/interfaces
+        auto lo
+        iface lo inet loopback
+        auto eth0
+        iface eth0 inet dhcp
+        EOF
+
+        cat << 'EOF' > $ROOTFS_DIR/etc/inittab
+        # /etc/inittab
+        ::sysinit:/sbin/openrc sysinit
+        ::sysinit:/sbin/openrc boot
+        ::wait:/sbin/openrc default
+        tty1::respawn:/sbin/agetty --autologin root tty1 linux
+        tty2::respawn:/sbin/agetty tty2 linux
+        tty3::respawn:/sbin/agetty tty3 linux
+        tty4::respawn:/sbin/agetty tty4 linux
+        ttyS0::respawn:/sbin/agetty ttyS0 linux
+        ::ctrlaltdel:/sbin/reboot
+        ::shutdown:/sbin/openrc shutdown
+        EOF
+
+        cp ./setup-routeros.sh $ROOTFS_DIR/usr/local/bin/setup-routeros
+        chmod +x $ROOTFS_DIR//usr/local/bin/setup-routeros
+        cp ./npkextract/npkextract $ROOTFS_DIR/usr/local/bin/npkextract
+        chmod +x $ROOTFS_DIR/usr/local/bin/npkextract
+
+        cat << 'EOF' > $ROOTFS_DIR/root/.zprofile
+        if command -v setup-routeros >/dev/null 2>&1; then
+            setup-routeros
+        fi
+        EOF
+
+        cat << 'EOF' | sudo chroot $ROOTFS_DIR /usr/bin/env PATH=/usr/bin:/bin:/usr/sbin:/sbin /bin/sh
+        set -e
+        echo "nameserver 1.1.1.1" > /etc/resolv.conf
+        apk update
+        apk upgrade
+        apk add alpine-base openrc busybox-mdev-openrc dhcpcd curl ca-certificates linux-lts linux-firmware-none
+        apk add bash dialog sgdisk dosfstools e2fsprogs util-linux parted
+        apk add zsh zsh-syntax-highlighting zsh-autosuggestions coreutils ncurses iproute2
+
+        rc-update add devfs sysinit
+        rc-update add dmesg sysinit
+        rc-update add mdev sysinit
+        rc-update add hwdrivers sysinit
+        rc-update add acpid boot
+        rc-update add hostname boot
+        rc-update add hwclock boot
+        rc-update add modules boot
+        rc-update add sysctl boot
+        rc-update add bootmisc boot
+        rc-update add dhcpcd boot
+        rc-update add networking default
+
+        curl -o /root/.zshrc https://gitlab.com/kalilinux/packages/kali-defaults/-/raw/kali/master/etc/skel/.zshrc
+        sed -i 's/^PROMPT_ALTERNATIVE=twoline/PROMPT_ALTERNATIVE=oneline/' /root/.zshrc
+        sed -i 's/^NEWLINE_BEFORE_PROMPT=yes/NEWLINE_BEFORE_PROMPT=no/' /root/.zshrc
+        sed -i 's|/usr/share/zsh-syntax-highlighting|/usr/share/zsh/plugins/zsh-syntax-highlighting|g' /root/.zshrc
+        sed -i 's|/usr/share/zsh-autosuggestions|/usr/share/zsh/plugins/zsh-autosuggestions|g' /root/.zshrc
+
+        sed -i 's|^root:\(.*\):/bin/sh$|root:\1:/bin/zsh|' /etc/passwd
+        sed -i 's/^root:.*/root:::0:::::/' /etc/shadow
+        printf 'Welcome to Alpine!\n\nTo start the RouterOS installation wizard, run: setup-routeros\n\n' > /etc/motd
+  
+        sed -i 's/^features=.*/features="ata base cdrom network scsi nvme ext2 usb virtio"/' /etc/mkinitfs/mkinitfs.conf
+        KERNEL_VERSION=$(ls /lib/modules | head -1)
+        mkinitfs -k -t /tmp "$KERNEL_VERSION"
+        rm -rf /lib/modules
+        mv /tmp/lib/modules /lib
+        depmod "$KERNEL_VERSION"
+        ln -sf sbin/init /init
+
+        apk cache clean
+        EOF
+
+        sudo umount -v $ROOTFS_DIR/dev
+        sudo umount -v $ROOTFS_DIR/sys
+        sudo umount -v $ROOTFS_DIR/proc
+
+        cp $ROOTFS_DIR/boot/vmlinuz-* $BUILD_DIR/vmlinuz
+
+        sudo rm -rf $ROOTFS_DIR/tmp/*
+        sudo rm -rf $ROOTFS_DIR/boot/*
+        sudo rm -rf $ROOTFS_DIR/var/cache/*
+
+        (cd "$ROOTFS_DIR" && sudo find . -print0 | sudo cpio --owner=root:root --null -H newc -o 2>/dev/null | xz -C crc32 -v9eT0 > $BUILD_DIR/initramfs.xz)
+        sudo rm -rf $ROOTFS_DIR
+
+        size=$(stat -c %s "$BUILD_DIR/vmlinuz")
+        printf "vmlinuz size : %d bytes (%.1f MB)\n" "$size" "$(echo "scale=1; $size/1024/1024" | bc)"
+        size=$(stat -c %s "$BUILD_DIR/initramfs.xz")
+        printf "initramfs size : %d bytes (%.1f MB)\n" "$size" "$(echo "scale=1; $size/1024/1024" | bc)"
+
+    - name: Build ISO & INSTALL image files
       run: |
         set -e
         sudo modprobe nbd
@@ -389,15 +498,33 @@ jobs:
         if [ "$ARCH" == "x86" ]; then
             echo "Creating x86 ISO..."
             mkdir -p $BUILD_DIR/new_iso/isolinux
-            cp /usr/lib/ISOLINUX/isolinux.bin $BUILD_DIR/new_iso/isolinux/
+            cp -v /usr/lib/ISOLINUX/isolinux.bin $BUILD_DIR/new_iso/isolinux/
-            cp /usr/lib/syslinux/modules/bios/ldlinux.c32 $BUILD_DIR/new_iso/isolinux/
+            cp -v /usr/lib/syslinux/modules/bios/ldlinux.c32 $BUILD_DIR/new_iso/isolinux/
-            echo -e 'default system\n\nlabel system\n\tkernel linux\n\tappend load_ramdisk=1 root=/dev/ram0 -install -cdrom' | tee $BUILD_DIR/new_iso/isolinux/isolinux.cfg
+            cp -v /usr/lib/syslinux/modules/bios/libutil.c32 $BUILD_DIR/new_iso/isolinux/
+            cp -v /usr/lib/syslinux/modules/bios/menu.c32 $BUILD_DIR/new_iso/isolinux/
+            tee $BUILD_DIR/new_iso/isolinux/isolinux.cfg > /dev/null << 'EOF'
+        UI menu.c32
+        MENU TITLE MikroTik RouterOS Install CDROM
+        MENU CLEAR
+        DEFAULT system
+        TIMEOUT 0
+        LABEL system
+            MENU LABEL Install RouterOS
+            KERNEL linux
+            APPEND load_ramdisk=1 root=/dev/ram0 -install -cdrom
+        LABEL alpine
+            MENU LABEL Boot Alpine Linux
+            KERNEL vmlinuz
+            APPEND initrd=initramfs.xz
+        EOF
+            cp -v $BUILD_DIR/vmlinuz $BUILD_DIR/new_iso/isolinux/vmlinuz
+            cp -v $BUILD_DIR/initramfs.xz $BUILD_DIR/new_iso/isolinux/initramfs.xz
+
             sudo mount -o loop $BUILD_DIR/new_iso/efiboot.img $BUILD_DIR/efiboot
             python3 patch.py kernel $BUILD_DIR/efiboot/linux.x86_64 -O $BUILD_DIR/new_iso/isolinux/linux
             sudo umount $BUILD_DIR/efiboot
-            #修改为16M,减小镜像体积
             rm -f $BUILD_DIR/new_iso/efiboot.img
-            truncate --size 16M $BUILD_DIR/new_iso/efiboot.img
+            truncate --size 64M $BUILD_DIR/new_iso/efiboot.img
             mkfs.vfat -n "Boot" $BUILD_DIR/new_iso/efiboot.img
             sudo mount -o loop,uid=$(id -u),gid=$(id -g) $BUILD_DIR/new_iso/efiboot.img $BUILD_DIR/efiboot
             mkdir -p $BUILD_DIR/efiboot/EFI/BOOT
@@ -412,11 +539,18 @@ jobs:
             loader /linux.x86_64
             options "load_ramdisk=1 root=/dev/ram0 -install -cdrom debug"
         }
+        menuentry "Alpine Linux" {
+            loader /vmlinuz
+            initrd /initramfs.xz
+        }
         default_selection /EFI/BOOT/BOOTX64.EFI
         EOF
             cp -v $BUILD_DIR/new_iso/isolinux/linux $BUILD_DIR/efiboot/linux.x86_64 
+            cp -v $BUILD_DIR/vmlinuz $BUILD_DIR/efiboot/vmlinuz
+            cp -v $BUILD_DIR/initramfs.xz $BUILD_DIR/efiboot/initramfs.xz
             sync
             sudo umount $BUILD_DIR/efiboot
+
             xorriso -as mkisofs -o $PUBLISH_DIR/mikrotik-$VERSION$ARCH_EXT.iso \
                         -V 'MikroTik' \
                         -publisher "WWW.MIKROTIK.COM" \
@@ -463,9 +597,9 @@ jobs:
         EOF
             tee $BUILD_DIR/install/syslinux.cfg > /dev/null << 'EOF'
         default system
-        LABEL system
+        label system
-        	KERNEL linux
+        	kernel linux
-        	APPEND load_ramdisk=1 -install -hdd
+        	append load_ramdisk=1 -install -hdd
         EOF
             NPK_FILES=($(find $BUILD_DIR/new_iso/*.npk))
             for ((i=1; i<=${#NPK_FILES[@]}; i++))
@@ -516,7 +650,7 @@ jobs:
         rm -rf $BUILD_DIR/new_iso
         rm -rf $BUILD_DIR/efiboot
 
-    - name: Create CHR image files
+    - name: Build CHR image files
       run: |
         set -e
         OVF_TEMPLATE='<?xml version="1.0" encoding="UTF-8"?>
@@ -614,240 +748,145 @@ jobs:
         </Envelope>' 
         sudo apt-get install -y parted > /dev/null
         mkdir -p $BUILD_DIR/chr/{boot,routeros}
+
+        prepare_image(){
+          local IMAGE="$1"
+          local BOOT_MODE="$2"
+
+          truncate --size 128M "$IMAGE"
+          local END=$(( ($(stat -c '%s' "$IMAGE") / 512 - 4096) / 8 * 8 - 1 ))
+          sgdisk --set-alignment=1 \
+              --new=1:34:65535 --typecode=1:EF00 --change-name=1:"RouterOS Boot" \
+              --new=2:65536:$END --typecode=2:8300 --change-name=2:"RouterOS" \
+              --hybrid=1:2:EE \
+              "$IMAGE"
+          # Active CHR mode
+          printf '\x01' | dd of="$IMAGE" bs=1 seek=336 conv=notrunc status=none
+          # Active boot partition
+          printf '\x80' | dd of="$IMAGE" bs=1 seek=446 conv=notrunc status=none
+          # Must be 0x83, otherwise "ERROR: could not find disk!"
+          printf '\x83' | dd of="$IMAGE" bs=1 seek=450 conv=notrunc status=none
+          if [[ "$BOOT_MODE" == "bios" ]]; then
+              echo "FA31C08ED0BC007C89E65007501FFBFCBF0006B90001F2A5EA1D060000BEBE07B304803C807423803C00750983C610FECB75EFCD18BE9B06AC3C00740B56BB0700B40ECD105EEBF0EBFE8B148B4C0289F5BF0500BB007CB8010257CD135F730C31C0CD134F75EDBE7C06EBCCBFFE7D813D55AA75C289EEEA007C00004572726F72206C6F6164696E67206F7065726174696E672073797374656D004D697373696E67206F7065726174696E672073797374656D0000000000" |
+                  xxd -r -p |
+                  sudo dd of="$IMAGE" bs=1 conv=notrunc status=none
+          fi
+        }
+
+        build_image() {
+          local IMAGE="$1"
+          local BOOT_MODE="$2"
+
+          prepare_image $IMAGE $BOOT_MODE
+
+          sudo qemu-nbd -d /dev/nbd0 2>/dev/null || true
+          sudo qemu-nbd -c /dev/nbd0 -f raw "$IMAGE"
+          sudo partprobe /dev/nbd0
+
+          # Boot partition
+          if [[ "$BOOT_MODE" == "bios" ]]; then
+              sudo mkfs.ext2 -F -m 0 -L "RouterOS Boot" /dev/nbd0p1
+          elif [[ "$BOOT_MODE" == "efi" ]]; then
+              sudo mkfs.vfat -F 16 -n "BOOT" /dev/nbd0p1
+          else
+            echo "ERROR: unsupported boot mode: $BOOT_MODE" >&2
+            return 1
+          fi
+          sudo mount /dev/nbd0p1 "$BUILD_DIR/chr/boot"
+          sudo mkdir -p "$BUILD_DIR/chr/boot/EFI/BOOT"
+          if [ "$ARCH" == "x86" ]; then
+            sudo cp -vf  "$BUILD_DIR/chr/BOOTX64.EFI" "$BUILD_DIR/chr/boot/EFI/BOOT/BOOTX64.EFI"
+          elif [ "$ARCH" == "arm64" ]; then
+            sudo cp -vf $BUILD_DIR/chr/BOOTAA64.EFI $BUILD_DIR/chr/boot/EFI/BOOT/BOOTAA64.EFI
+          fi
+          if [[ "$BOOT_MODE" == "bios" ]]; then
+              sudo "$BUILD_DIR/chr/milo" "$BUILD_DIR/chr/boot"
+          fi
+          sudo umount "$BUILD_DIR/chr/boot"
+
+          # RouterOS partition
+          sudo mkfs.ext4 -F -m 0 -L "RouterOS" /dev/nbd0p2
+          sudo mount /dev/nbd0p2 "$BUILD_DIR/chr/routeros"
+          sudo mkdir -p $BUILD_DIR/chr/routeros/{var/pdb/{system,option},boot,bin,rw/disk}
+          sudo install -m 0755 "$BUILD_DIR/chr/milo" "$BUILD_DIR/chr/routeros/bin/milo"
+          sudo install -m 0755 "$BUILD_DIR/chr/bash" "$BUILD_DIR/chr/routeros/bin/bash"
+          sudo cp -v $PUBLISH_DIR/option-$VERSION$ARCH_EXT.npk $BUILD_DIR/chr/routeros/var/pdb/option/image
+          sudo cp -v $PUBLISH_DIR/routeros-$VERSION$ARCH_EXT.npk $BUILD_DIR/chr/routeros/var/pdb/system/image
+          printf '%s\n' \
+              '#!/bin/sh' \
+              '# This script will be executed *before* RouterOS *loader* start.' \
+              '# You can put your own initialization stuff in here' |
+              sudo tee "$BUILD_DIR/chr/routeros/rw/disk/rc.local" >/dev/null
+          sudo umount /dev/nbd0p2
+
+          sudo qemu-nbd -d /dev/nbd0
+
+          echo "Image built: $IMAGE"
+
+          local IMAGE_PREFIX="${IMAGE%.img}"
+          qemu-img convert -f raw -O qcow2 $IMAGE $IMAGE_PREFIX.qcow2
+          qemu-img convert -f raw -O vmdk  $IMAGE $IMAGE_PREFIX.vmdk
+          qemu-img convert -f raw -O vpc $IMAGE $IMAGE_PREFIX.vhd
+          qemu-img convert -f raw -O vhdx $IMAGE $IMAGE_PREFIX.vhdx
+          qemu-img convert -f raw -O vdi $IMAGE $IMAGE_PREFIX.vdi
+
+          local IMAGE_NAME="${IMAGE_PREFIX##*/}"
+          local VMDK_FILE="$IMAGE_NAME-disk1.vmdk"
+          local OVF_FILE="$IMAGE_NAME.ovf"
+          local OVA_FILE="$IMAGE_NAME.ova"
+
+          qemu-img convert -f raw -O vmdk -o subformat=streamOptimized "$IMAGE" "$BUILD_DIR/$VMDK_FILE"
+          local FILE_SIZE=$(stat -c %s "$BUILD_DIR/$VMDK_FILE")
+          echo "$OVF_TEMPLATE" |
+            sed -e "s|{VMDK_FILE}|$VMDK_FILE|g" \
+                -e "s|{FILE_SIZE}|$FILE_SIZE|g" \
+                -e "s|{FIRMWARE_TYPE}|$BOOT_MODE|g" \
+            > "$BUILD_DIR/$OVF_FILE"
+          (cd $BUILD_DIR && tar -cvf "$OVA_FILE" "$OVF_FILE" "$VMDK_FILE")
+          rm -f "$BUILD_DIR/$VMDK_FILE"
+          rm -f "$BUILD_DIR/$OVF_FILE"
+
+          echo "✅ Generated images:"
+          ls -lh "$IMAGE_PREFIX".*
+
+          (cd $BUILD_DIR && \
+              zip $PUBLISH_DIR/$IMAGE_NAME.ova.zip $IMAGE_NAME.ova && \
+              zip $PUBLISH_DIR/$IMAGE_NAME.qcow2.zip $IMAGE_NAME.qcow2 && \
+              zip $PUBLISH_DIR/$IMAGE_NAME.vmdk.zip $IMAGE_NAME.vmdk && \
+              zip $PUBLISH_DIR/$IMAGE_NAME.vhd.zip $IMAGE_NAME.vhd && \
+              zip $PUBLISH_DIR/$IMAGE_NAME.vhdx.zip $IMAGE_NAME.vhdx && \
+              zip $PUBLISH_DIR/$IMAGE_NAME.vdi.zip $IMAGE_NAME.vdi && \
+              zip $PUBLISH_DIR/$IMAGE_NAME.img.zip $IMAGE_NAME.img )
+          rm -f "$IMAGE_PREFIX".*
+        }
+
         if [ "$ARCH" == "x86" ]; then
-            echo "Creating x86 uefi CHR..."
+            echo "🚀 Creating CHR image for x86..."
             python3 npk.py extract $PUBLISH_DIR/routeros-$VERSION$ARCH_EXT.npk boot/EFI/BOOT/BOOTX64.EFI $BUILD_DIR/chr/BOOTX64.EFI
             python3 npk.py extract $PUBLISH_DIR/routeros-$VERSION$ARCH_EXT.npk bin/milo $BUILD_DIR/chr/milo
+            python3 npk.py extract $PUBLISH_DIR/routeros-$VERSION$ARCH_EXT.npk bin/bash $BUILD_DIR/chr/bash
             chmod +x $BUILD_DIR/chr/milo
-            #要求MBR分区表第一个分区类型必须为0x8300,否则ERROR: could not find disk!
+            echo "🔄 Creating CHR image for x86 UEFI ..."
-            truncate --size 128M $BUILD_DIR/chr-$VERSION$ARCH_EXT.img
+            if ! build_image "$BUILD_DIR/chr-$VERSION$ARCH_EXT.img" efi; then
-            sgdisk \
+                echo "❌ failed to build x86 UEFI image"
-                --zap-all \
+                exit 1
-                --set-alignment=1 \
+            fi
-                --new=1:34:+32M --typecode=1:8300 --change-name=1:"RouterOS Boot" \
+            echo "Creating CHR image for x86 legacy BIOS  ..."
-                --new=2:0:0 --typecode=2:8300 --change-name=2:"RouterOS" \
+            if ! build_image "$BUILD_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.img" bios; then
-                --gpttombr=1:2 \
+                echo "❌ failed to build x86 legacy BIOS image"
-                $BUILD_DIR/chr-$VERSION$ARCH_EXT.img
+                exit 1
-            dd if=$BUILD_DIR/chr-$VERSION$ARCH_EXT.img of=$BUILD_DIR/mbr.bin bs=1 count=512 conv=notrunc
+            fi
-            printf '\x01' | dd of=$BUILD_DIR/mbr.bin bs=1 count=1 seek=336 conv=notrunc
-            sgdisk \
-                --zap-all \
-                --set-alignment=1 \
-                --new=1:34:+32M --typecode=1:EF00 --change-name=1:"RouterOS Boot" \
-                --new=2:0:0 --typecode=2:8300 --change-name=2:"RouterOS" \
-                $BUILD_DIR/chr-$VERSION$ARCH_EXT.img
-            dd if=$BUILD_DIR/mbr.bin of=$BUILD_DIR/chr-$VERSION$ARCH_EXT.img bs=1 count=512 conv=notrunc
-            rm $BUILD_DIR/mbr.bin
-
-            sudo qemu-nbd -d /dev/nbd0
-            sudo qemu-nbd -c /dev/nbd0 -f raw $BUILD_DIR/chr-$VERSION$ARCH_EXT.img
-            sudo partprobe /dev/nbd0
-            sudo mkfs.vfat -n "Boot" /dev/nbd0p1
-            sudo mkfs.ext4 -F -L "RouterOS"  -m 0 /dev/nbd0p2
-            sudo mount -o uid=$(id -u),gid=$(id -g) /dev/nbd0p1 $BUILD_DIR/chr/boot
-            sudo mkdir -p $BUILD_DIR/chr/boot/EFI/BOOT
-            sudo cp -v $BUILD_DIR/chr/BOOTX64.EFI $BUILD_DIR/chr/boot/EFI/BOOT/BOOTX64.EFI
-            sudo umount /dev/nbd0p1
-
-            sudo mount /dev/nbd0p2 $BUILD_DIR/chr/routeros
-            sudo mkdir -p $BUILD_DIR/chr/routeros/{var/pdb/{system,option},boot,bin,rw/disk}
-            # cmdStartVerify bin/milo
-            sudo cp -v $BUILD_DIR/chr/milo $BUILD_DIR/chr/routeros/bin/milo
-            sudo cp -v $PUBLISH_DIR/option-$VERSION$ARCH_EXT.npk $BUILD_DIR/chr/routeros/var/pdb/option/image
-            sudo cp -v $PUBLISH_DIR/routeros-$VERSION$ARCH_EXT.npk $BUILD_DIR/chr/routeros/var/pdb/system/image
-            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 $BUILD_DIR/chr/routeros/rw/disk/rc.local
-            sudo umount /dev/nbd0p2
-            sudo qemu-nbd -d /dev/nbd0
-
-            qemu-img convert -f raw -O qcow2 $BUILD_DIR/chr-$VERSION$ARCH_EXT.img $BUILD_DIR/chr-$VERSION$ARCH_EXT.qcow2
-            qemu-img convert -f raw -O vmdk  $BUILD_DIR/chr-$VERSION$ARCH_EXT.img $BUILD_DIR/chr-$VERSION$ARCH_EXT.vmdk
-            qemu-img convert -f raw -O vpc $BUILD_DIR/chr-$VERSION$ARCH_EXT.img $BUILD_DIR/chr-$VERSION$ARCH_EXT.vhd
-            qemu-img convert -f raw -O vhdx $BUILD_DIR/chr-$VERSION$ARCH_EXT.img $BUILD_DIR/chr-$VERSION$ARCH_EXT.vhdx
-            qemu-img convert -f raw -O vdi $BUILD_DIR/chr-$VERSION$ARCH_EXT.img $BUILD_DIR/chr-$VERSION$ARCH_EXT.vdi
-
-            VMDK_FILE=chr-$VERSION$ARCH_EXT-disk1.vmdk
-            qemu-img convert -f raw -O vmdk -o subformat=streamOptimized \
-                $BUILD_DIR/chr-$VERSION$ARCH_EXT.img \
-                $BUILD_DIR/$VMDK_FILE
-            FILE_SIZE=$(stat -c %s "$BUILD_DIR/$VMDK_FILE")
-            OVF_FILE=chr-$VERSION$ARCH_EXT.ovf
-            OVA_FILE=chr-$VERSION$ARCH_EXT.ova
-            echo "$OVF_TEMPLATE" | sed -e "s|{VMDK_FILE}|$VMDK_FILE|g" \
-                    -e "s|{FILE_SIZE}|$FILE_SIZE|g" \
-                    -e "s|{FIRMWARE_TYPE}|efi|g" | tee $BUILD_DIR/$OVF_FILE
-            (cd $BUILD_DIR && tar -cvf "$OVA_FILE" "$OVF_FILE" "$VMDK_FILE")
-            rm $BUILD_DIR/$VMDK_FILE
-            rm $BUILD_DIR/$OVF_FILE
-            
-            echo "✅ UEFI CHR created: "
-            ls -la $BUILD_DIR/chr-$VERSION$ARCH_EXT.*
-
-            (cd $BUILD_DIR && \
-                zip $PUBLISH_DIR/chr-$VERSION$ARCH_EXT.ova.zip chr-$VERSION$ARCH_EXT.ova && \
-                zip $PUBLISH_DIR/chr-$VERSION$ARCH_EXT.qcow2.zip chr-$VERSION$ARCH_EXT.qcow2 && \
-                zip $PUBLISH_DIR/chr-$VERSION$ARCH_EXT.vmdk.zip chr-$VERSION$ARCH_EXT.vmdk && \
-                zip $PUBLISH_DIR/chr-$VERSION$ARCH_EXT.vhd.zip chr-$VERSION$ARCH_EXT.vhd && \
-                zip $PUBLISH_DIR/chr-$VERSION$ARCH_EXT.vhdx.zip chr-$VERSION$ARCH_EXT.vhdx && \
-                zip $PUBLISH_DIR/chr-$VERSION$ARCH_EXT.vdi.zip chr-$VERSION$ARCH_EXT.vdi && 
-                zip $PUBLISH_DIR/chr-$VERSION$ARCH_EXT.img.zip chr-$VERSION$ARCH_EXT.img )
-            rm $BUILD_DIR/chr-$VERSION$ARCH_EXT.*
-
-
-            FIRMWARE_TYPE="bios" 
-            echo "Creating x86 legacy bios CHR..."
-
-            truncate --size 128M $BUILD_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.img
-            sgdisk \
-                --zap-all \
-                --set-alignment=1 \
-                --new=1:34:+32M --typecode=1:8300 --change-name=1:"RouterOS Boot" --attributes=1:set:2 \
-                --new=2:0:-4096 --typecode=2:8300 --change-name=2:"RouterOS" \
-                --gpttombr=1:2 \
-                $BUILD_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.img
-            dd if=$BUILD_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.img of=$BUILD_DIR/mbr.bin bs=1 count=512  conv=notrunc
-            echo "FA31C08ED0BC007C89E65007501FFBFCBF0006B90001F2A5EA1D060000BEBE07B304803C807423803C00750983C610FECB75EFCD18BE9B06AC3C00740B56BB0700B40ECD105EEBF0EBFE8B148B4C0289F5BF0500BB007CB8010257CD135F730C31C0CD134F75EDBE7C06EBCCBFFE7D813D55AA75C289EEEA007C00004572726F72206C6F6164696E67206F7065726174696E672073797374656D004D697373696E67206F7065726174696E672073797374656D0000000000" | xxd -r -p | sudo dd of=$BUILD_DIR/mbr.bin bs=1 count=440 conv=notrunc
-            printf '\x01' | sudo dd of=$BUILD_DIR/mbr.bin bs=1 count=1 seek=336 conv=notrunc
-            printf '\x80' | sudo dd of=$BUILD_DIR/mbr.bin bs=1 count=1 seek=446 conv=notrunc
-            sgdisk \
-                --zap-all \
-                --set-alignment=1 \
-                --new=1:34:+32M --typecode=1:8300 --change-name=1:"RouterOS Boot" --attributes=1:set:2 \
-                --new=2:0:-4096 --typecode=2:8300 --change-name=2:"RouterOS" \
-                $BUILD_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.img
-            dd if=$BUILD_DIR/mbr.bin of=$BUILD_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.img bs=1 count=512 conv=notrunc
-            sudo rm $BUILD_DIR/mbr.bin
-            sudo qemu-nbd -d /dev/nbd0
-            sudo qemu-nbd -c /dev/nbd0 -f raw $BUILD_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.img
-            sudo partprobe /dev/nbd0
-            sudo mkfs.ext2 -F -m 0 -L "RouterOS Boot" /dev/nbd0p1
-            sudo mkfs.ext4 -F -m 0 -L "RouterOS"  /dev/nbd0p2
-            sudo mount /dev/nbd0p1 $BUILD_DIR/chr/boot
-            sudo mkdir -p $BUILD_DIR/chr/boot/EFI/BOOT
-            sudo cp -vf $BUILD_DIR/chr/BOOTX64.EFI $BUILD_DIR/chr/boot/EFI/BOOT/BOOTX64.EFI
-            sudo $BUILD_DIR/chr/milo $BUILD_DIR/chr/boot
-            sudo umount /dev/nbd0p1
-
-            sudo mount /dev/nbd0p2 $BUILD_DIR/chr/routeros
-            sudo mkdir -p $BUILD_DIR/chr/routeros/{var/pdb/{system,option},boot,bin,rw/disk}
-            sudo cp -v $BUILD_DIR/chr/milo $BUILD_DIR/chr/routeros/bin/milo
-            sudo cp -v $PUBLISH_DIR/option-$VERSION$ARCH_EXT.npk $BUILD_DIR/chr/routeros/var/pdb/option/image
-            sudo cp -v $PUBLISH_DIR/routeros-$VERSION$ARCH_EXT.npk $BUILD_DIR/chr/routeros/var/pdb/system/image
-            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 $BUILD_DIR/chr/routeros/rw/disk/rc.local
-            sudo umount /dev/nbd0p2
-            sudo qemu-nbd -d /dev/nbd0
-
-            qemu-img convert -f raw -O qcow2 $BUILD_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.img $BUILD_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.qcow2
-            qemu-img convert -f raw -O vmdk  $BUILD_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.img $BUILD_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.vmdk
-            qemu-img convert -f raw -O vpc $BUILD_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.img $BUILD_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.vhd
-            qemu-img convert -f raw -O vhdx $BUILD_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.img $BUILD_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.vhdx
-            qemu-img convert -f raw -O vdi $BUILD_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.img $BUILD_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.vdi
-
-            VMDK_FILE=chr-$VERSION$ARCH_EXT-disk1.vmdk
-            qemu-img convert -f raw -O vmdk -o subformat=streamOptimized \
-                $BUILD_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.img \
-                $BUILD_DIR/$VMDK_FILE
-            FILE_SIZE=$(stat -c %s "$BUILD_DIR/$VMDK_FILE")
-            OVF_FILE=chr-$VERSION$ARCH_EXT-legacy-bios.ovf
-            OVA_FILE=chr-$VERSION$ARCH_EXT-legacy-bios.ova
-            echo "$OVF_TEMPLATE" | sed -e "s|{VMDK_FILE}|$VMDK_FILE|g" \
-                    -e "s|{FILE_SIZE}|$FILE_SIZE|g" \
-                    -e "s|{FIRMWARE_TYPE}|bios|g" | tee $BUILD_DIR/$OVF_FILE
-            (cd $BUILD_DIR && tar -cvf "$OVA_FILE" "$OVF_FILE" "$VMDK_FILE")
-            rm $BUILD_DIR/$VMDK_FILE
-            rm $BUILD_DIR/$OVF_FILE
-
-
-            echo "✅ legacy BIOS CHR created: "
-            ls -la $BUILD_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.*
-
-            (cd $BUILD_DIR && \
-                zip $PUBLISH_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.ova.zip chr-$VERSION$ARCH_EXT-legacy-bios.ova && \
-                zip $PUBLISH_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.qcow2.zip chr-$VERSION$ARCH_EXT-legacy-bios.qcow2 && \
-                zip $PUBLISH_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.vmdk.zip chr-$VERSION$ARCH_EXT-legacy-bios.vmdk && \
-                zip $PUBLISH_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.vhd.zip chr-$VERSION$ARCH_EXT-legacy-bios.vhd && \
-                zip $PUBLISH_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.vhdx.zip chr-$VERSION$ARCH_EXT-legacy-bios.vhdx && \
-                zip $PUBLISH_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.vdi.zip chr-$VERSION$ARCH_EXT-legacy-bios.vdi && \
-                zip $PUBLISH_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.img.zip chr-$VERSION$ARCH_EXT-legacy-bios.img )
-            rm $BUILD_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.*
-            rm $BUILD_DIR/chr/BOOTX64.EFI
-            rm $BUILD_DIR/chr/milo
 
         elif [ "$ARCH" == "arm64" ]; then
-            echo "Creating arm64 CHR..."
+            echo "🚀 Creating CHR image for arm64..."
             python3 npk.py extract $PUBLISH_DIR/routeros-$VERSION$ARCH_EXT.npk boot/kernel $BUILD_DIR/chr/kernel
             python3 patch.py buildefi $BUILD_DIR/chr/kernel $BUILD_DIR/chr/BOOTAA64.EFI
             rm -r $BUILD_DIR/chr/kernel
-
+            echo "🔄Creating CHR image for arm64 UEFI  ..."
-            #要求MBR分区表第一个分区类型必须为0x8300,否则ERROR: could not find disk!
+            if ! build_image "$BUILD_DIR/chr-$VERSION$ARCH_EXT.img" efi; then
-            truncate --size 128M $BUILD_DIR/chr-$VERSION$ARCH_EXT.img
+                echo "❌ failed to build arm64 UEFI image"
-            sgdisk \
+                exit 1
-                --zap-all \
+            fi
-                --set-alignment=1 \
-                --new=1:34:+32M --typecode=1:8300 --change-name=1:"RouterOS Boot" \
-                --new=2:0:0 --typecode=2:8300 --change-name=2:"RouterOS" \
-                --gpttombr=1:2 \
-                $BUILD_DIR/chr-$VERSION$ARCH_EXT.img
-            dd if=$BUILD_DIR/chr-$VERSION$ARCH_EXT.img of=$BUILD_DIR/mbr.bin bs=1 count=512 conv=notrunc
-            printf '\x01' | dd of=$BUILD_DIR/mbr.bin bs=1 count=1 seek=336 conv=notrunc
-            sgdisk \
-                --zap-all \
-                --set-alignment=1 \
-                --new=1:34:+32M --typecode=1:EF00 --change-name=1:"RouterOS Boot" \
-                --new=2:0:0 --typecode=2:8300 --change-name=2:"RouterOS" \
-                $BUILD_DIR/chr-$VERSION$ARCH_EXT.img
-            dd if=$BUILD_DIR/mbr.bin of=$BUILD_DIR/chr-$VERSION$ARCH_EXT.img bs=1 count=512 conv=notrunc
-            rm $BUILD_DIR/mbr.bin
-            sudo qemu-nbd -d /dev/nbd0
-            sudo qemu-nbd -c /dev/nbd0 -f raw $BUILD_DIR/chr-$VERSION$ARCH_EXT.img
-            sudo partprobe /dev/nbd0
-            sudo mkfs.vfat -n "Boot" "/dev/nbd0p1"
-            sudo mkfs.ext4 -F -m 0 -L "RouterOS" "/dev/nbd0p2"
-            sudo mount -o uid=$(id -u),gid=$(id -g) /dev/nbd0p1 $BUILD_DIR/chr/boot
-            sudo mkdir -p $BUILD_DIR/chr/boot/EFI/BOOT
-            sudo mv -v $BUILD_DIR/chr/BOOTAA64.EFI $BUILD_DIR/chr/boot/EFI/BOOT/BOOTAA64.EFI
-            sudo umount /dev/nbd0p1
-
-            sudo mount /dev/nbd0p2 $BUILD_DIR/chr/routeros
-            sudo mkdir -p $BUILD_DIR/chr/routeros/{var/pdb/{system,option},boot,rw/disk}
-            sudo cp -v $PUBLISH_DIR/option-$VERSION$ARCH_EXT.npk $BUILD_DIR/chr/routeros/var/pdb/option/image
-            sudo cp -v $PUBLISH_DIR/routeros-$VERSION$ARCH_EXT.npk $BUILD_DIR/chr/routeros/var/pdb/system/image
-            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 $BUILD_DIR/chr/routeros/rw/disk/rc.local
-            sudo umount /dev/nbd0p2
-            sudo qemu-nbd -d /dev/nbd0
-
-            qemu-img convert -f raw -O qcow2 $BUILD_DIR/chr-$VERSION$ARCH_EXT.img $BUILD_DIR/chr-$VERSION$ARCH_EXT.qcow2
-            qemu-img convert -f raw -O vmdk  $BUILD_DIR/chr-$VERSION$ARCH_EXT.img $BUILD_DIR/chr-$VERSION$ARCH_EXT.vmdk
-            qemu-img convert -f raw -O vpc $BUILD_DIR/chr-$VERSION$ARCH_EXT.img $BUILD_DIR/chr-$VERSION$ARCH_EXT.vhd
-            qemu-img convert -f raw -O vhdx $BUILD_DIR/chr-$VERSION$ARCH_EXT.img $BUILD_DIR/chr-$VERSION$ARCH_EXT.vhdx
-            qemu-img convert -f raw -O vdi $BUILD_DIR/chr-$VERSION$ARCH_EXT.img $BUILD_DIR/chr-$VERSION$ARCH_EXT.vdi
-
-            VMDK_FILE=chr-$VERSION$ARCH_EXT-disk1.vmdk
-            qemu-img convert -f raw -O vmdk -o subformat=streamOptimized \
-                $BUILD_DIR/chr-$VERSION$ARCH_EXT.img \
-                $BUILD_DIR/$VMDK_FILE
-            FILE_SIZE=$(stat -c %s "$BUILD_DIR/$VMDK_FILE")
-            OVF_FILE=chr-$VERSION$ARCH_EXT.ovf
-            OVA_FILE=chr-$VERSION$ARCH_EXT.ova
-            echo "$OVF_TEMPLATE" | sed -e "s|{VMDK_FILE}|$VMDK_FILE|g" \
-                    -e "s|{FILE_SIZE}|$FILE_SIZE|g" \
-                    -e "s|{FIRMWARE_TYPE}|efi|g" | tee $BUILD_DIR/$OVF_FILE
-            (cd $BUILD_DIR && tar -cvf "$OVA_FILE" "$OVF_FILE" "$VMDK_FILE")
-            rm $BUILD_DIR/$VMDK_FILE
-            rm $BUILD_DIR/$OVF_FILE
-
-
-            echo "✅ CHR created: "
-            ls -la $BUILD_DIR/chr-$VERSION$ARCH_EXT.*
-
-            (cd $BUILD_DIR && \
-                zip $PUBLISH_DIR/chr-$VERSION$ARCH_EXT.ova.zip chr-$VERSION$ARCH_EXT.ova && \
-                zip $PUBLISH_DIR/chr-$VERSION$ARCH_EXT.qcow2.zip chr-$VERSION$ARCH_EXT.qcow2 && \
-                zip $PUBLISH_DIR/chr-$VERSION$ARCH_EXT.vmdk.zip chr-$VERSION$ARCH_EXT.vmdk && \
-                zip $PUBLISH_DIR/chr-$VERSION$ARCH_EXT.vhd.zip chr-$VERSION$ARCH_EXT.vhd && \
-                zip $PUBLISH_DIR/chr-$VERSION$ARCH_EXT.vhdx.zip chr-$VERSION$ARCH_EXT.vhdx && \
-                zip $PUBLISH_DIR/chr-$VERSION$ARCH_EXT.vdi.zip chr-$VERSION$ARCH_EXT.vdi && 
-                zip $PUBLISH_DIR/chr-$VERSION$ARCH_EXT.img.zip chr-$VERSION$ARCH_EXT.img )
-            rm $BUILD_DIR/chr-$VERSION$ARCH_EXT.*
         fi
         rm -rf $BUILD_DIR/chr
 

README.md

@@ -5,66 +5,100 @@
 [![License: WTFPL](https://img.shields.io/badge/License-WTFPL-brightgreen.svg)](./LICENSE)
 [![CoC:WTFCoC](https://img.shields.io/badge/CoC-WTFCoC-brightgreen.svg)](./CODE_OF_CONDUCT.md)
 
+**English** | [中文](./README_CN.md)
 
-## ⚠️ 重要声明
+> ## ⚠️ Important Notice
-**此项目及工具仅供测试用途。使用风险自负。生产环境请使用官方授权版本。**
+>
+> **This project and its tools are for testing purposes only. Use at your own risk. Please use the officially licensed version for production environments.**
 
-## 架构：x86、arm64 
+## 🏗️ Architecture Support
-- **主页：** https://mikrotik.ltd/ 
+### x86 / arm64 (This Project)
-- **演示：** https://demo.mikrotik.ltd/
+- **Homepage:** https://mikrotik.ltd/ 
-- **授权： 安装option.npk后将自动授予最高级别许可证。**
+- **Demo:** https://demo.mikrotik.ltd/
-- **源代码：** https://github.com/elseif/MikroTikPatch
+- **License: Installing `option.npk` will automatically grant the highest-level license.**
-- **授权BOT：** https://t.me/ROS_Keygen_Bot
+- **License Bot:** https://t.me/ROS_Keygen_Bot
 - **Docker：** `docker run -d --privileged --name chr ghcr.io/elseif/chr:latest`
 
-## 架构：arm64, arm, mipsbe, mmips, ppc, smips, x86 
+### arm64, arm, mipsbe, mmips, ppc, smips, x86 
-- **主页：** https://routeros.ltd/
+- **Homepage:** https://routeros.ltd/
-- **授权： 需要赞助**，*CHR版本(x86/Arm64)支持在线直接获取授权*
+- **License: Sponsorship required.** *CHR versions (x86/Arm64) support online direct licensing.*
-- **功能：** 支持在线自定义制作品牌包
+- **Features:** Supports online custom brand package creation.
+---
 
-## 支持的云功能
+## 🔧 Feature Guide
-| 功能 | 命令 |
+> All features below require the `option.npk` package to be installed first.
-|------|------|
+### 1. Enable Container Mode (No Physical Reboot Required)
-| 在线升级 | `system/package/update/install` |
+```bash
-| DDNS | `ip/cloud/set ddns-enabled=yes` |
+# Step 1: Enable container mode
-| 云备份 | `/system/backup/cloud/upload-file action=create-and-upload password=any` |
+/system/device-mode/update container=yes
+# Step 2: Force reboot (execute in a new terminal)
+/system/shell cmd="reboot -f"
+```
+### 2. Shell Access
+#### A. Via Terminal
+```bash
+/system/shell
+# or shorthand
+/sh
+```
+#### B. Via SSH / Telnet
+```bash
+# Username: devel
+# Password: Same as the admin password
+ssh devel@<router-ip>
+```
+### 3.  x86 Architecture: CHR ↔ x86 Mode Switch
 
-## 启用容器模式（无需物理重启）
+```bash
-1. 安装 `option.npk` 包；
+# Execute after entering shell
-2. 打开终端执行：`system/device-mode/update container=yes`；
+keygen chr   # Switch to CHR mode
-3. 打开新终端执行：`system/shell cmd="reboot -f"`。
+keygen x86   # Switch to x86 mode
+```
+### 4. Boot Auto-Run Script
 
-## 通过终端进入shell
+1. Create or edit the `/rw/disk/rc.local` file.
-- 安装 `option.npk` 包
+2. Write your script content, for example：
-- 打开终端执行：`/system/shell` 或 `/sh`
 
-## 通过ssh或telnet进入shell
-- 安装 `option.npk` 包
-- ssh或telnet登录用户名为:`devel`，密码与`admin`密码相同。
-
-## x86架构支持CHR和x86模式切换
-- 安装 `option.npk` 包
-- 进入shell执行：`keygen chr` 或 `keygen x86`
-
-## 支持开机自动运行脚本
-- 安装 `option.npk` 包
-- 创建或者编辑文件目录下的`rc.local`文件，即：`/rw/disk/rc.local`文件
-- 写入脚本内容，例如：
 ```bash
 #!/bin/sh
 # This script will be executed *before* RouterOS *loader* start.
 # You can put your own initialization stuff in here
 echo "Hello, world!"
 ```
-- 开机启动时将看到输出增加：`Starting rc.local...`
+
-- 启动后进入shell执行：`cat /ram/startup.catlog | grep 'Hello'` 查看输出。
+3. You will see the output during boot: `Starting rc.local...`
+4. After boot, check the output:
+
+```bash
+# Enter shell
+cat /ram/startup.catlog | grep 'Hello'
+```
+
+---
+
+## ☁️ Cloud Services
+
+| Feature | Command |
+|------|------|
+| Online Upgrade | `system/package/update/install` |
+| Dynamic DNS | `ip/cloud/set ddns-enabled=yes` |
+| Cloud Backup | `/system/backup/cloud/upload-file action=create-and-upload password=any` |
+| Internet Detection | `/interface/detect-internet/set detect-interface-list=all` |
+
+---
+
+## 📚 Resources
+
+- [MikroTik Official Documentation](https://manual.mikrotik.com/)
+- [Telegram Group](https://t.me/+99Mw06p3K7NlMmNl)
+- [GitHub Source Code](https://github.com/elseif/MikroTikPatch)
 
 
-### 更多关于RouterOS的信息请查看: https://manual.mikrotik.com/
+---
-
+## 💖 Sponsors
-### 感谢赞助
-[DartNode(aff)](https://dartnode.com?aff=SnazzyLobster067)  | [ZMTO(aff)](https://console.zmto.com/?affid=1588) | [Vultr(aff)](https://www.vultr.com/?ref=9807160-9J)
 [![Powered by DartNode](https://dartnode.com/branding/DN-Open-Source-sm.png)](https://dartnode.com "Powered by DartNode - Free VPS for Open Source")
+[DartNode(aff)](https://dartnode.com?aff=SnazzyLobster067)  | [ZMTO(aff)](https://console.zmto.com/?affid=1588) | [Vultr(aff)](https://www.vultr.com/?ref=9807160-9J)
+
 
 
 

README_CN.md

@@ -0,0 +1,115 @@
+# MikroTik RouterOS Patch
+[![Patch Mikrotik RouterOS](https://github.com/elseif/MikroTikPatch/actions/workflows/main.yml/badge.svg)](https://github.com/elseif/MikroTikPatch/actions/workflows/main.yml)
+![Cloud Status](https://img.shields.io/endpoint?url=https://mikrotik.ltd/status/cloud)
+
+[![License: WTFPL](https://img.shields.io/badge/License-WTFPL-brightgreen.svg)](./LICENSE)
+[![CoC:WTFCoC](https://img.shields.io/badge/CoC-WTFCoC-brightgreen.svg)](./CODE_OF_CONDUCT.md)
+
+[English](./README.md) | **中文**
+
+>## ⚠️ 重要声明
+>
+>**此项目及工具仅供测试用途。使用风险自负。生产环境请使用官方授权版本。**
+
+## 🏗️ 架构支持
+### x86 / arm64 （本项目）
+- **主页：** https://mikrotik.ltd/ 
+- **演示：** https://demo.mikrotik.ltd/
+- **授权： 安装option.npk后将自动授予最高级别许可证。**
+- **授权BOT：** https://t.me/ROS_Keygen_Bot
+- **Docker：** `docker run -d --privileged --name chr ghcr.io/elseif/chr:latest`
+
+### arm64, arm, mipsbe, mmips, ppc, smips, x86 
+- **主页：** https://routeros.ltd/
+- **授权： 需要赞助**，*CHR版本(x86/Arm64)支持在线直接获取授权*
+- **功能：** 支持在线自定义制作品牌包
+
+---
+
+## 🔧 功能指南
+> 以下功能均需先安装 `option.npk` 包。
+### 1. 启用容器模式（无需物理重启）
+```bash
+# 步骤 1：启用容器模式
+/system/device-mode/update container=yes
+# 步骤 2：强制重启（在新终端中执行）
+/system/shell cmd="reboot -f"
+```
+### 2. Shell 访问
+#### A. 通过终端
+```bash
+/system/shell
+# 或简写
+/sh
+```
+#### B. 通过 SSH / Telnet
+```bash
+# 用户名: devel
+# 密码: 与 admin 密码相同
+ssh devel@<router-ip>
+```
+### 3. x86 架构：CHR ↔ x86 模式切换
+
+```bash
+# 进入 shell 后执行
+keygen chr   # 切换为 CHR 模式
+keygen x86   # 切换为 x86 模式
+```
+### 4. 开机自动运行脚本
+
+1. 创建或编辑 `/rw/disk/rc.local` 文件
+2. 写入脚本内容，例如：
+
+```bash
+#!/bin/sh
+# This script will be executed *before* RouterOS *loader* start.
+# You can put your own initialization stuff in here
+echo "Hello, world!"
+```
+
+3. 开机启动时将看到输出：`Starting rc.local...`
+4. 启动后查看输出：
+
+```bash
+# 进入 shell
+cat /ram/startup.catlog | grep 'Hello'
+```
+
+---
+
+## ☁️ 云服务
+
+| 功能 | 命令 |
+|------|------|
+| 在线升级 | `system/package/update/install` |
+| 动态域名 | `ip/cloud/set ddns-enabled=yes` |
+| 云备份 | `/system/backup/cloud/upload-file action=create-and-upload password=any` |
+| 网络检测 | `/interface/detect-internet/set detect-interface-list=all` |
+
+---
+
+## 📚 相关资源
+
+- [MikroTik 官方文档](https://manual.mikrotik.com/)
+- [Telegram 群组](https://t.me/+99Mw06p3K7NlMmNl)
+- [GitHub 源码](https://github.com/elseif/MikroTikPatch)
+
+
+---
+## 💖 感谢赞助
+[![Powered by DartNode](https://dartnode.com/branding/DN-Open-Source-sm.png)](https://dartnode.com "Powered by DartNode - Free VPS for Open Source")
+[DartNode(aff)](https://dartnode.com?aff=SnazzyLobster067)  | [ZMTO(aff)](https://console.zmto.com/?affid=1588) | [Vultr(aff)](https://www.vultr.com/?ref=9807160-9J)
+
+
+
+
+
+
+
+
+
+
+
+
+
+

chr.sh

@@ -294,6 +294,12 @@ create_autorun() {
             ask_until "$MSG_ADMIN_PASSWORD" "$RANDOM_ADMIN_PASS"
             RANDOM_ADMIN_PASS=$resp
             cat <<EOF > "$MNT/rw/autorun.scr"
+/tool mac-server set allowed-interface-list=none 
+/tool mac-server mac-winbox set allowed-interface-list=none 
+/tool mac-server ping set enabled=no
+/ip neighbor discovery-settings set discover-interface-list=none 
+/tool bandwidth-server set enabled=no 
+/ip dns set allow-remote-requests=no
 /user set admin password="$RANDOM_ADMIN_PASS"
 /ip dns set servers=$DNS
 /ip address add address=$ADDRESS interface=[/interface ethernet get [find mac-address=$MAC] name]

index.html

@@ -442,9 +442,9 @@
 
             // Fetch latest version numbers from MikroTik servers
             const loadingOverlay = document.getElementById("loading");
-            const [routeros7_stable, routeros7_testing, routeros6_longterm, routeros6_stable] = await Promise.all([
+            const [routeros7_stable, routeros7_longterm, routeros6_longterm, routeros6_stable] = await Promise.all([
                 fetch_latest_versions(`https://upgrade.mikrotik.ltd/routeros/NEWESTa7.stable?ts=${Date.now()}`, "7.19.4"),
-                fetch_latest_versions(`https://upgrade.mikrotik.ltd/routeros/NEWESTa7.testing?ts=${Date.now()}`, "7.20rc1"),
+                fetch_latest_versions(`https://upgrade.mikrotik.ltd/routeros/NEWESTa7.long-term?ts=${Date.now()}`, "7.20rc1"),
                 fetch_latest_versions(`https://upgrade.mikrotik.ltd/routeros/NEWEST6.long-term?ts=${Date.now()}`, "6.49.18"),
                 fetch_latest_versions(`https://upgrade.mikrotik.ltd/routeros/NEWEST6.stable?ts=${Date.now()}`, "6.49.19"),
             ]);
@@ -456,7 +456,7 @@
             const downloads =[
                 {
                     title:"RouterOS v7",
-                    versions:[ { title:"Stable", version:routeros7_stable }, { title:"Testing", version:routeros7_testing } ],
+                    versions:[ { title:"Long-Term", version:routeros7_longterm },{ title:"Stable", version:routeros7_stable } ],
                     groups: [
                         { title:"ARM64 / AMPERE", arch:"arm64", downloads:[ { title:"Main package", type:"main" }, { title:"Extra packages", type:"extra" }, { title:"ISO image for AMPERE", type:"iso" } ] },
                         { title:"X86", arch:"x86", downloads:[ { title:"Main package", type:"main" }, { title:"Extra packages", type:"extra" }, { title:"CD Image", type:"iso" }, { title:"Install image", type:"install" } ] },
@@ -472,7 +472,7 @@
                 },
                 {
                     title:"Cloud Hosted Router",
-                    versions:[ { title:"Long-Term", version:routeros6_longterm }, { title:"Stable", version:routeros6_stable }, { title:"Stable", version:routeros7_stable }, { title:"Testing", version:routeros7_testing } ],
+                    versions:[ { title:"Long-Term", version:routeros6_longterm }, { title:"Stable", version:routeros6_stable }, { title:"Long-Term", version:routeros7_longterm }, { title:"Stable", version:routeros7_stable } ],
                     groups:[
                         { title:"X86", arch:"x86", downloads:[ { title:"Main package", type:"main" }, { title:"Extra packages", type:"extra" }, { title:"VHDX image", type:"vhdx" }, { title:"VMDK image", type:"vmdk" }, { title:"VDI image", type:"vdi" }, { title:"VirtualPC image", type:"vhd" }, { title:"Raw disk image", type:"img" }, { title:"OVA template", type:"ova" } ] },
                         { title:"ARM64 / AMPERE", arch:"arm64", downloads:[ { title:"Main package", type:"main" }, { title:"Extra packages", type:"extra" }, { title:"VHDX image", type:"vhdx" }, { title:"VMDK image", type:"vmdk" }, { title:"VDI image", type:"vdi" }, { title:"VirtualPC image", type:"vhd" }, { title:"Raw disk image", type:"img" } ] }
@@ -709,8 +709,8 @@
 
             // Generate version selection buttons
             versionBtnsContainer.innerHTML = `
+                <button data-version="${routeros7_longterm}" class="px-3 py-1.5 text-sm font-medium rounded-md hover:bg-blue-200 dark:hover:bg-gray-600 transition-all">v7 Long-Term</button>
                 <button data-version="${routeros7_stable}" class="px-3 py-1.5 text-sm font-medium rounded-md hover:bg-blue-200 dark:hover:bg-gray-600 transition-all">v7 Stable</button>
-                <button data-version="${routeros7_testing}" class="px-3 py-1.5 text-sm font-medium rounded-md hover:bg-blue-200 dark:hover:bg-gray-600 transition-all">v7 Testing</button>
                 <button data-version="${routeros6_longterm}" class="px-3 py-1.5 text-sm font-medium rounded-md hover:bg-blue-200 dark:hover:bg-gray-600 transition-all">v6 Long-Term</button>
                 <button data-version="${routeros6_stable}" class="px-3 py-1.5 text-sm font-medium rounded-md hover:bg-blue-200 dark:hover:bg-gray-600 transition-all">v6 Stable</button>
             `;

npkextract/Makefile

@@ -0,0 +1,39 @@
+TOOLCHAIN_DIR ?= $(HOME)/musl-toolchains/i686-linux-musl-cross
+CROSS_COMPILE ?= $(TOOLCHAIN_DIR)/bin/i686-linux-musl-
+
+CC      = $(CROSS_COMPILE)gcc
+STRIP   = $(CROSS_COMPILE)strip
+
+TARGET  = npkextract
+SRC     = npkextract.c
+OBJ     = $(SRC:.c=.o)
+
+CFLAGS  ?= -O2 -Wall -Wextra -D_GNU_SOURCE
+CFLAGS  += -static -m32
+LDFLAGS += -static -s
+
+
+.PHONY: all clean info
+
+all: $(TARGET)
+
+$(TARGET): $(OBJ)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+	@$(STRIP) --strip-all $(TARGET) 2>/dev/null || true
+	@echo "=========================================================="
+	@echo " Successfully built static binary: $(TARGET)"
+	@ls -lh $(TARGET)
+	@file $(TARGET) 2>/dev/null || true
+	@echo "=========================================================="
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
+info:
+	@echo "Compiler: $(CC)"
+	@echo "Strip:    $(STRIP)"
+	@echo "CFLAGS:   $(CFLAGS)"
+	@echo "LDFLAGS:  $(LDFLAGS)"
+
+clean:
+	rm -f $(TARGET) $(OBJ)

npkextract/npkextract.c

@@ -0,0 +1,426 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <utime.h>
+
+typedef struct {
+    const unsigned char *source;
+    size_t source_len;
+    size_t tag;
+    unsigned int bitcount;
+    unsigned char *dest;
+    size_t dest_len;
+    size_t dest_cap;
+} TINF_DATA;
+
+typedef struct {
+    unsigned short table[16];
+    unsigned short trans[288];
+} TINF_TREE;
+
+static const unsigned char tinf_default_length_bits[30] = {
+    0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 127
+};
+
+static const unsigned short tinf_default_length_base[30] = {
+    3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0
+};
+
+static const unsigned char tinf_default_dist_bits[30] = {
+    0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13
+};
+
+static const unsigned short tinf_default_dist_base[30] = {
+    1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577
+};
+
+static const unsigned char tinf_clcidx[19] = {
+    16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
+};
+
+static unsigned int tinf_getbit(TINF_DATA *d) {
+    if (!d->bitcount--) {
+        d->tag = d->source_len ? *d->source++ : 0;
+        if (d->source_len) d->source_len--;
+        d->bitcount = 7;
+    }
+    unsigned int bit = d->tag & 1;
+    d->tag >>= 1;
+    return bit;
+}
+
+static unsigned int tinf_read_bits(TINF_DATA *d, int num, int base) {
+    unsigned int val = 0;
+    if (num) {
+        unsigned int limit = 1 << num;
+        unsigned int mask;
+        for (mask = 1; mask < limit; mask <<= 1) {
+            if (tinf_getbit(d)) val += mask;
+        }
+    }
+    return val + base;
+}
+
+static void tinf_build_tree(TINF_TREE *t, const unsigned char *lengths, unsigned int num) {
+    unsigned short offs[16];
+    unsigned int i, sum = 0;
+
+    for (i = 0; i < 16; ++i) t->table[i] = 0;
+    for (i = 0; i < num; ++i) t->table[lengths[i]]++;
+    t->table[0] = 0;
+
+    for (i = 0; i < 16; ++i) {
+        offs[i] = sum;
+        sum += t->table[i];
+    }
+
+    for (i = 0; i < num; ++i) {
+        if (lengths[i]) t->trans[offs[lengths[i]]++] = i;
+    }
+}
+
+static int tinf_decode_symbol(TINF_DATA *d, const TINF_TREE *t) {
+    int sum = 0, cur = 0, len = 0;
+    do {
+        cur = 2 * cur + tinf_getbit(d);
+        len++;
+        sum += t->table[len];
+        cur -= t->table[len];
+    } while (cur >= 0);
+    return t->trans[sum + cur];
+}
+
+static void tinf_build_fixed_trees(TINF_TREE *lt, TINF_TREE *dt) {
+    unsigned char lengths[288];
+    int i;
+    for (i = 0; i <= 143; ++i) lengths[i] = 8;
+    for (; i <= 255; ++i) lengths[i] = 9;
+    for (; i <= 279; ++i) lengths[i] = 7;
+    for (; i <= 287; ++i) lengths[i] = 8;
+    tinf_build_tree(lt, lengths, 288);
+    for (i = 0; i < 32; ++i) lengths[i] = 5;
+    tinf_build_tree(dt, lengths, 32);
+}
+
+static int tinf_inflate_block_data(TINF_DATA *d, TINF_TREE *lt, TINF_TREE *dt) {
+    while (1) {
+        int sym = tinf_decode_symbol(d, lt);
+        if (sym == 256) return 0;
+
+        if (sym < 256) {
+            if (d->dest_len >= d->dest_cap) {
+                size_t ncap = d->dest_cap ? d->dest_cap * 2 : 1024 * 1024;
+                unsigned char *nd = realloc(d->dest, ncap);
+                if (!nd) return -1;
+                d->dest = nd;
+                d->dest_cap = ncap;
+            }
+            d->dest[d->dest_len++] = (unsigned char)sym;
+        } else {
+            sym -= 257;
+            int length = tinf_read_bits(d, tinf_default_length_bits[sym], tinf_default_length_base[sym]);
+            int dist_sym = tinf_decode_symbol(d, dt);
+            int dist = tinf_read_bits(d, tinf_default_dist_bits[dist_sym], tinf_default_dist_base[dist_sym]);
+
+            if (d->dest_len + length > d->dest_cap) {
+                size_t ncap = (d->dest_len + length) * 2 + 1024 * 1024;
+                unsigned char *nd = realloc(d->dest, ncap);
+                if (!nd) return -1;
+                d->dest = nd;
+                d->dest_cap = ncap;
+            }
+
+            unsigned char *src = d->dest + d->dest_len - dist;
+            while (length--) {
+                d->dest[d->dest_len++] = *src++;
+            }
+        }
+    }
+}
+
+static int tinf_inflate_uncompressed_block(TINF_DATA *d) {
+    d->bitcount = 0;
+    if (d->source_len < 4) return -1;
+    unsigned int length = d->source[0] | (d->source[1] << 8);
+    d->source += 4;
+    d->source_len -= 4;
+    if (d->source_len < length) return -1;
+
+    if (d->dest_len + length > d->dest_cap) {
+        size_t ncap = d->dest_len + length + 1024 * 1024;
+        unsigned char *nd = realloc(d->dest, ncap);
+        if (!nd) return -1;
+        d->dest = nd;
+        d->dest_cap = ncap;
+    }
+
+    memcpy(d->dest + d->dest_len, d->source, length);
+    d->dest_len += length;
+    d->source += length;
+    d->source_len -= length;
+    return 0;
+}
+
+static int tinf_inflate_dynamic_block(TINF_DATA *d) {
+    TINF_TREE lt, dt, ct;
+    unsigned char lengths[288 + 32];
+    unsigned int hlit = tinf_read_bits(d, 5, 257);
+    unsigned int hdist = tinf_read_bits(d, 5, 1);
+    unsigned int hclen = tinf_read_bits(d, 4, 4);
+    unsigned int i, num;
+
+    unsigned char clen[19];
+    memset(clen, 0, sizeof(clen));
+    for (i = 0; i < hclen; ++i) clen[tinf_clcidx[i]] = tinf_read_bits(d, 3, 0);
+    tinf_build_tree(&ct, clen, 19);
+
+    for (num = 0; num < hlit + hdist;) {
+        int sym = tinf_decode_symbol(d, &ct);
+        if (sym < 16) {
+            lengths[num++] = sym;
+        } else if (sym == 16) {
+            unsigned char prev = lengths[num - 1];
+            for (i = tinf_read_bits(d, 2, 3); i; --i) lengths[num++] = prev;
+        } else if (sym == 17) {
+            for (i = tinf_read_bits(d, 3, 3); i; --i) lengths[num++] = 0;
+        } else {
+            for (i = tinf_read_bits(d, 7, 11); i; --i) lengths[num++] = 0;
+        }
+    }
+
+    tinf_build_tree(&lt, lengths, hlit);
+    tinf_build_tree(&dt, lengths + hlit, hdist);
+    return tinf_inflate_block_data(d, &lt, &dt);
+}
+
+static unsigned char *zlib_decompress(const unsigned char *src, size_t src_len, size_t *out_len) {
+    if (src_len < 2) return NULL;
+    size_t offset = 0;
+    // Check zlib header (RFC 1950)
+    if ((src[0] * 256 + src[1]) % 31 == 0 && (src[0] & 0x0F) == 8) {
+        offset = 2;
+        if (src[1] & 0x20) offset += 4;
+    }
+
+    TINF_DATA d;
+    memset(&d, 0, sizeof(d));
+    d.source = src + offset;
+    d.source_len = src_len > offset ? src_len - offset : 0;
+    d.dest_cap = src_len * 4 + 1024 * 1024;
+    d.dest = malloc(d.dest_cap);
+    if (!d.dest) return NULL;
+
+    int bfinal;
+    do {
+        bfinal = tinf_getbit(&d);
+        int btype = tinf_read_bits(&d, 2, 0);
+
+        if (btype == 0) {
+            if (tinf_inflate_uncompressed_block(&d) < 0) { free(d.dest); return NULL; }
+        } else if (btype == 1) {
+            TINF_TREE lt, dt;
+            tinf_build_fixed_trees(&lt, &dt);
+            if (tinf_inflate_block_data(&d, &lt, &dt) < 0) { free(d.dest); return NULL; }
+        } else if (btype == 2) {
+            if (tinf_inflate_dynamic_block(&d) < 0) { free(d.dest); return NULL; }
+        } else {
+            free(d.dest);
+            return NULL;
+        }
+    } while (!bfinal);
+
+    *out_len = d.dest_len;
+    return d.dest;
+}
+
+static void mkdir_p(const char *dir) {
+    char tmp[1024];
+    snprintf(tmp, sizeof(tmp), "%s", dir);
+    for (char *p = tmp + 1; *p; p++) {
+        if (*p == '/') {
+            *p = '\0';
+            mkdir(tmp, 0755);
+            *p = '/';
+        }
+    }
+    mkdir(tmp, 0755);
+}
+
+const char *get_part_name(uint32_t id) {
+    switch (id) {
+        case 0x01: return "NAME_INFO";
+        case 0x02: return "DESCRIPTION";
+        case 0x03: return "DEPENDENCIES";
+        case 0x04: return "FILE_CONTAINER";
+        case 0x07: return "INSTALL_SCRIPT";
+        case 0x08: return "UNINSTALL_SCRIPT";
+        case 0x09: return "SIGNATURE";
+        case 0x10: return "ARCHITECTURE";
+        case 0x11: return "PKG_CONFLICTS";
+        case 0x12: return "PKG_INFO";
+        case 0x13: return "FEATURES";
+        case 0x14: return "PKG_FEATURES";
+        case 0x15: return "SQUASHFS";
+        case 0x16: return "NULL_BLOCK";
+        case 0x17: return "GIT_COMMIT";
+        case 0x18: return "CHANNEL";
+        case 0x19: return "HEADER";
+        default:   return "UNKNOWN";
+    }
+}
+
+int main(int argc, char *argv[]) {
+    if (argc < 3) {
+        fprintf(stderr, "Usage: %s <package.npk> <output_directory>\n", argv[0]);
+        return 1;
+    }
+
+    const char *npk_path = argv[1];
+    const char *out_dir = argv[2];
+
+    FILE *fp = fopen(npk_path, "rb");
+    if (!fp) {
+        fprintf(stderr, "Error: Failed to open NPK file '%s'\n", npk_path);
+        return 1;
+    }
+
+    fseek(fp, 0, SEEK_END);
+    long file_size = ftell(fp);
+    fseek(fp, 0, SEEK_SET);
+
+    printf("Parsing NPK: '%s' (%ld bytes)\n", npk_path, file_size);
+    mkdir_p(out_dir);
+
+    int total_extracted = 0;
+    long offset = 0;
+
+    while (offset + 6 <= file_size) {
+        fseek(fp, offset, SEEK_SET);
+        uint16_t id16;
+        uint32_t size32;
+
+        if (fread(&id16, 2, 1, fp) != 1 || fread(&size32, 4, 1, fp) != 1) {
+            break;
+        }
+
+        if (id16 > 0 && id16 <= 0x20 && size32 <= (uint32_t)(file_size - offset - 6)) {
+            printf("  [Part 0x%02X: %-15s] offset=%ld, size=%u\n", id16, get_part_name(id16), offset, size32);
+
+            if (id16 == 0x04) { // FILE_CONTAINER
+                unsigned char *zbuf = malloc(size32);
+                if (zbuf && fread(zbuf, 1, size32, fp) == size32) {
+                    size_t decomp_len = 0;
+                    unsigned char *decomp = zlib_decompress(zbuf, size32, &decomp_len);
+                    if (decomp) {
+                        printf("    -> Decompressed FILE_CONTAINER: %zu bytes\n", decomp_len);
+
+                        unsigned char *p = decomp;
+                        unsigned char *end = decomp + decomp_len;
+                        int item_idx = 0;
+
+                        while (p + 30 <= end) {
+                            uint32_t fmode     = *(uint32_t *)(p + 0);
+                            uint32_t fmtime    = *(uint32_t *)(p + 8);
+                            uint32_t fsize     = *(uint32_t *)(p + 24);
+                            uint16_t name_len  = *(uint16_t *)(p + 28);
+                            p += 30;
+
+                            if (p + name_len > end) {
+                                printf("    -> Header overrun: name_len=%u exceeds buffer\n", name_len);
+                                break;
+                            }
+
+                            char fname[512] = {0};
+                            if (name_len >= sizeof(fname)) name_len = sizeof(fname) - 1;
+                            memcpy(fname, p, name_len);
+                            fname[name_len] = '\0';
+                            p += name_len;
+
+                            if (p + fsize > end) {
+                                printf("    -> Data overrun: '%s' size=%u exceeds buffer\n", fname, fsize);
+                                break;
+                            }
+
+                            char full_path[1024];
+                            snprintf(full_path, sizeof(full_path), "%s/%s", out_dir, fname);
+
+                            char dir_path[1024];
+                            snprintf(dir_path, sizeof(dir_path), "%s", full_path);
+                            char *slash = strrchr(dir_path, '/');
+                            if (slash) { *slash = '\0'; mkdir_p(dir_path); }
+
+                            if (S_ISDIR(fmode)) {
+                                mkdir_p(full_path);
+                                printf("    -> [%d] [DIR]  %s/\n", ++item_idx, fname);
+                            } else if (S_ISLNK(fmode)) {
+                                char target[1024] = {0};
+                                size_t tlen = fsize < sizeof(target) ? fsize : sizeof(target) - 1;
+                                memcpy(target, p, tlen);
+                                unlink(full_path);
+                                symlink(target, full_path);
+                                printf("    -> [%d] [LINK] %s -> %s\n", ++item_idx, fname, target);
+                                total_extracted++;
+                            } else {
+                                FILE *out = fopen(full_path, "wb");
+                                if (out) {
+                                    fwrite(p, 1, fsize, out);
+                                    fclose(out);
+                                    chmod(full_path, fmode ? (fmode & 07777) : 0644);
+
+                                    if (fmtime) {
+                                        struct utimbuf ut;
+                                        ut.actime = fmtime;
+                                        ut.modtime = fmtime;
+                                        utime(full_path, &ut);
+                                    }
+
+                                    printf("    -> [%d] [FILE] %s (%u bytes, mode=%04o)\n", ++item_idx, fname, fsize, fmode & 07777);
+                                    total_extracted++;
+                                } else {
+                                    fprintf(stderr, "Warning: Failed to create file '%s'\n", full_path);
+                                }
+                            }
+
+                            p += fsize;
+                        }
+
+                        free(decomp);
+                    } else {
+                        printf("    -> ZLIB decompression failed for FILE_CONTAINER\n");
+                    }
+                }
+                if (zbuf) free(zbuf);
+            } else if (id16 == 0x15) { 
+                char sq_file[1024];
+                snprintf(sq_file, sizeof(sq_file), "%s/image.squashfs", out_dir);
+                FILE *out = fopen(sq_file, "wb");
+                if (out) {
+                    unsigned char buf[65536];
+                    uint32_t remaining = size32;
+                    while (remaining > 0) {
+                        size_t to_read = remaining > sizeof(buf) ? sizeof(buf) : remaining;
+                        size_t n = fread(buf, 1, to_read, fp);
+                        if (n == 0) break;
+                        fwrite(buf, 1, n, out);
+                        remaining -= n;
+                    }
+                    fclose(out);
+                    printf("    -> Extracted SQUASHFS image: %s (%u bytes)\n", sq_file, size32);
+                    total_extracted++;
+                }
+            }
+
+            offset += 6 + size32;
+            continue;
+        }
+
+        offset++;
+    }
+
+    fclose(fp);
+    printf("\nExtraction complete: %d item(s) extracted from NPK to '%s'.\n", total_extracted, out_dir);
+    return 0;
+}

patch.py

@@ -358,12 +358,10 @@ def patch_squashfs(path,key_dict):
                     if old_url in data:
                         print(f'{file_path} url patched {old_url.decode()[:7]}...')
                         data = data.replace(old_url,new_url)
-                modified = False
                 for old_public_key,new_public_key in key_dict.items():
                     new_data  = replace_key(old_public_key,new_public_key,data,file_path)
                     if new_data != data:
                         data = new_data
-                        modified = True
                 with open(f'{file_path}_', 'wb') as f:
                     f.write(data)
         if 'loader' in files and os.path.isfile(os.path.join(root, 'loader')):