更新 mikrotik_patch_7.yml

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

.github/workflows/mikrotik_patch_7.yml

@@ -323,6 +323,99 @@ jobs:
     - name: Create chr-${{ env.LATEST_VERSION }}${{ env.ARCH }}.img
       if: steps.get_latest.outputs.has_new_version == 'true' && (matrix.arch == 'x86' || matrix.arch == 'arm64')
       run: |
+        OVF_TEMPLATE='<?xml version="1.0" encoding="UTF-8"?>
+        <Envelope vmw:buildId="build-18663434" xmlns="http://schemas.dmtf.org/ovf/envelope/1" xmlns:cim="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vmw="http://www.vmware.com/schema/ovf" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+          <References>
+            <File ovf:href="{VMDK_FILE}" ovf:id="file1" ovf:size="{FILE_SIZE}"/>
+          </References>
+          <DiskSection>
+            <Info>Virtual disk information</Info>
+            <Disk ovf:capacity="{CAPACITY_MB}" ovf:capacityAllocationUnits="byte * 2^20" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" ovf:populatedSize="{POPULATED_SIZE}"/>
+          </DiskSection>
+          <NetworkSection>
+            <Info>The list of logical networks</Info>
+            <Network ovf:name="VM Network">
+              <Description>The VM Network network</Description>
+            </Network>
+          </NetworkSection>
+          <VirtualSystem ovf:id="vm">
+            <Info>A virtual machine</Info>
+            <Name>MikroTik_RouterOS_CHR</Name>
+            <OperatingSystemSection ovf:id="100" vmw:osType="other3xLinux64Guest">
+              <Info>The kind of installed guest operating system</Info>
+            </OperatingSystemSection>
+            <VirtualHardwareSection>
+              <Info>Virtual hardware requirements</Info>
+              <System>
+                <vssd:ElementName>Virtual Hardware Family</vssd:ElementName>
+                <vssd:InstanceID>0</vssd:InstanceID>
+                <vssd:VirtualSystemIdentifier>MikroTik_RouterOS_CHR</vssd:VirtualSystemIdentifier>
+                <vssd:VirtualSystemType>vmx-10</vssd:VirtualSystemType>
+              </System>
+              <Item>
+                <rasd:AllocationUnits>hertz * 10^6</rasd:AllocationUnits>
+                <rasd:Description>Number of Virtual CPUs</rasd:Description>
+                <rasd:ElementName>1 virtual CPU(s)</rasd:ElementName>
+                <rasd:InstanceID>1</rasd:InstanceID>
+                <rasd:ResourceType>3</rasd:ResourceType>
+                <rasd:VirtualQuantity>1</rasd:VirtualQuantity>
+              </Item>
+              <Item>
+                <rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits>
+                <rasd:Description>Memory Size</rasd:Description>
+                <rasd:ElementName>1024MB of memory</rasd:ElementName>
+                <rasd:InstanceID>2</rasd:InstanceID>
+                <rasd:ResourceType>4</rasd:ResourceType>
+                <rasd:VirtualQuantity>1024</rasd:VirtualQuantity>
+              </Item>
+              <Item>
+                <rasd:Address>0</rasd:Address>
+                <rasd:Description>IDE Controller</rasd:Description>
+                <rasd:ElementName>ideController0</rasd:ElementName>
+                <rasd:InstanceID>3</rasd:InstanceID>
+                <rasd:ResourceType>5</rasd:ResourceType>
+              </Item>
+              <Item>
+                <rasd:AddressOnParent>0</rasd:AddressOnParent>
+                <rasd:ElementName>disk0</rasd:ElementName>
+                <rasd:HostResource>ovf:/disk/vmdisk1</rasd:HostResource>
+                <rasd:InstanceID>4</rasd:InstanceID>
+                <rasd:Parent>3</rasd:Parent>
+                <rasd:ResourceType>17</rasd:ResourceType>
+              </Item>
+              <Item>
+                <rasd:AddressOnParent>1</rasd:AddressOnParent>
+                <rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>
+                <rasd:Connection>VM Network</rasd:Connection>
+                <rasd:Description>VmxNet3 ethernet adapter on &quot;VM Network&quot;</rasd:Description>
+                <rasd:ElementName>ethernet0</rasd:ElementName>
+                <rasd:InstanceID>5</rasd:InstanceID>
+                <rasd:ResourceSubType>VmxNet3</rasd:ResourceSubType>
+                <rasd:ResourceType>10</rasd:ResourceType>
+                <vmw:Config ovf:required="false" vmw:key="slotInfo.pciSlotNumber" vmw:value="160"/>
+                <vmw:Config ovf:required="false" vmw:key="connectable.allowGuestControl" vmw:value="true"/>
+              </Item>
+              <Item ovf:required="false">
+                <rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>
+                <rasd:ElementName>video</rasd:ElementName>
+                <rasd:InstanceID>6</rasd:InstanceID>
+                <rasd:ResourceType>24</rasd:ResourceType>
+              </Item>
+              <Item ovf:required="false">
+                <rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>
+                <rasd:ElementName>vmci</rasd:ElementName>
+                <rasd:InstanceID>7</rasd:InstanceID>
+                <rasd:ResourceSubType>vmware.vmci</rasd:ResourceSubType>
+                <rasd:ResourceType>1</rasd:ResourceType>
+              </Item>
+              <vmw:Config ovf:required="false" vmw:key="firmware" vmw:value="{FIRMWARE_TYPE}"/>
+            </VirtualHardwareSection>
+            <AnnotationSection ovf:required="false">
+              <Info>A human-readable annotation</Info>
+              <Annotation>MikroTik RouterOS CHR v7.19.4</Annotation>
+            </AnnotationSection>
+          </VirtualSystem>
+        </Envelope>' 
         sudo modprobe nbd
         sudo apt-get install -y qemu-utils > /dev/null
         truncate --size 128M chr-$LATEST_VERSION$ARCH.img
@@ -369,7 +462,27 @@ jobs:
           sudo qemu-img convert -f raw -O vpc chr-$LATEST_VERSION$ARCH-legacy-bios.img chr-$LATEST_VERSION$ARCH-legacy-bios.vhd
           sudo qemu-img convert -f raw -O vhdx chr-$LATEST_VERSION$ARCH-legacy-bios.img chr-$LATEST_VERSION$ARCH-legacy-bios.vhdx
           sudo qemu-img convert -f raw -O vdi chr-$LATEST_VERSION$ARCH-legacy-bios.img chr-$LATEST_VERSION$ARCH-legacy-bios.vdi
-
+          
+          sudo qemu-img convert -f raw -O vmdk -o subformat=streamOptimized chr-$LATEST_VERSION$ARCH-legacy-bios.img chr-$LATEST_VERSION$ARCH-legacy-bios-disk1.vmdk
+          VMDK=chr-$LATEST_VERSION$ARCH-legacy-bios-disk1.vmdk
+          OVF=chr-$LATEST_VERSION$ARCH-legacy-bios.ovf
+          OVA=chr-$LATEST_VERSION$ARCH-legacy-bios.ova
+          FILE_SIZE=$(stat -c %s "$VMDK")
+          VIRTUAL_SIZE=$(qemu-img info --output=json "$VMDK" | jq '.["virtual-size"]' | head -n 1)
+          CAPACITY_MB=$((VIRTUAL_SIZE / 1024 / 1024))
+          POPULATED_SIZE=$FILE_SIZE
+          FIRMWARE_TYPE="bios" 
+          echo "$OVF_TEMPLATE" | sudo sed -e "s|{VMDK_FILE}|$VMDK|g" \
+              -e "s|{FILE_SIZE}|$FILE_SIZE|g" \
+              -e "s|{CAPACITY_MB}|$CAPACITY_MB|g" \
+              -e "s|{POPULATED_SIZE}|$POPULATED_SIZE|g" \
+              -e "s|{FIRMWARE_TYPE}|$FIRMWARE_TYPE|g" |sudo tee $OVF
+          sudo tar -cvf "$OVA" "$OVF" "$VMDK"
+          sudo rm $VMDK
+          sudo rm $OVF
+          sudo zip $OVA.zip $OVA
+          sudo rm $OVA
+          
           sudo zip chr-$LATEST_VERSION$ARCH-legacy-bios.qcow2.zip chr-$LATEST_VERSION$ARCH-legacy-bios.qcow2
           sudo zip chr-$LATEST_VERSION$ARCH-legacy-bios.vmdk.zip chr-$LATEST_VERSION$ARCH-legacy-bios.vmdk
           sudo zip chr-$LATEST_VERSION$ARCH-legacy-bios.vhd.zip chr-$LATEST_VERSION$ARCH-legacy-bios.vhd
@@ -405,11 +518,31 @@ jobs:
         sudo qemu-nbd -d /dev/nbd0
 
         sudo qemu-img convert -f raw -O qcow2 chr-$LATEST_VERSION$ARCH.img chr-$LATEST_VERSION$ARCH.qcow2
-        sudo qemu-img convert -f raw -O vmdk chr-$LATEST_VERSION$ARCH.img chr-$LATEST_VERSION$ARCH.vmdk
+        sudo qemu-img convert -f raw -O vmdk  chr-$LATEST_VERSION$ARCH.img chr-$LATEST_VERSION$ARCH.vmdk
         sudo qemu-img convert -f raw -O vpc chr-$LATEST_VERSION$ARCH.img chr-$LATEST_VERSION$ARCH.vhd
         sudo qemu-img convert -f raw -O vhdx chr-$LATEST_VERSION$ARCH.img chr-$LATEST_VERSION$ARCH.vhdx
         sudo qemu-img convert -f raw -O vdi chr-$LATEST_VERSION$ARCH.img chr-$LATEST_VERSION$ARCH.vdi
 
+        sudo qemu-img convert -f raw -O vmdk -o subformat=streamOptimized chr-$LATEST_VERSION$ARCH.img chr-$LATEST_VERSION$ARCH-disk1.vmdk
+        VMDK=chr-$LATEST_VERSION$ARCH-disk1.vmdk
+        OVF=chr-$LATEST_VERSION$ARCH.ovf
+        OVA=chr-$LATEST_VERSION$ARCH.ova
+        FILE_SIZE=$(stat -c %s "$VMDK")
+        VIRTUAL_SIZE=$(qemu-img info --output=json "$VMDK" | jq '.["virtual-size"]' | head -n 1)
+        CAPACITY_MB=$((VIRTUAL_SIZE / 1024 / 1024))
+        POPULATED_SIZE=$FILE_SIZE
+        FIRMWARE_TYPE="efi" 
+        echo "$OVF_TEMPLATE" | sudo sed -e "s|{VMDK_FILE}|$VMDK|g" \
+            -e "s|{FILE_SIZE}|$FILE_SIZE|g" \
+            -e "s|{CAPACITY_MB}|$CAPACITY_MB|g" \
+            -e "s|{POPULATED_SIZE}|$POPULATED_SIZE|g" \
+            -e "s|{FIRMWARE_TYPE}|$FIRMWARE_TYPE|g" |sudo tee $OVF
+        sudo tar -cvf "$OVA" "$OVF" "$VMDK"
+        sudo rm $VMDK
+        sudo rm $OVF
+        sudo zip $OVA.zip $OVA
+        sudo rm $OVA
+
         sudo zip chr-$LATEST_VERSION$ARCH.qcow2.zip chr-$LATEST_VERSION$ARCH.qcow2
         sudo zip chr-$LATEST_VERSION$ARCH.vmdk.zip chr-$LATEST_VERSION$ARCH.vmdk
         sudo zip chr-$LATEST_VERSION$ARCH.vhd.zip chr-$LATEST_VERSION$ARCH.vhd
@@ -423,6 +556,7 @@ jobs:
         sudo rm chr-$LATEST_VERSION$ARCH.vhdx
         sudo rm chr-$LATEST_VERSION$ARCH.vdi
         sudo rm chr-$LATEST_VERSION$ARCH.img
+
     
     - name: Cache all_packages${{ env.ARCH }}-${{ env.LATEST_VERSION }}.zip
       if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch != 'x86' && matrix.arch != 'arm64'

README.md

@@ -14,9 +14,17 @@
 
 *如果云服务或部署云服务的虚拟主机都不在线，那么在线更新、在线授权、云备份、DDNS以及ROS_Keygen_Bot都暂时不能使用*
 
-### 自动授权
-从7.19.4和7.20beta8开始，启动后自动激活授权许可，如果存在rc.local文件，会自动加载运行，这些功能都需要安装option.npk包。
-
+### 从7.19.4和7.20beta8开始，安装option包以后会自动激活授权，如果有rc.local文件，会自动加载运行。
+```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 && \
-gunzip -c chr.img.zip > chr.img  && \
-STORAGE=`lsblk | grep disk | cut -d ' ' -f 1 | head -n 1` && \
-echo STORAGE is $STORAGE && \
-ETH=`ip route show 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 && \
-sleep 5 && \
-dd if=chr.img of=/dev/$STORAGE bs=4M oflag=sync && \
-echo "Ok, reboot" && \
-echo 1 > /proc/sys/kernel/sysrq && \
-echo b > /proc/sysrq-trigger
+#!/bin/sh
+set -e
+if [ -d /sys/firmware/efi ]; then
+    echo "System boot mode: UEFI"
+    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
+else
+    echo "System boot mode: BIOS/MBR"
+    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
+fi
+cd /tmp
+unzip -p chr.img.zip > chr.img
+
+STORAGE=$(for d in /sys/block/*; do
+    case $(basename $d) in
+        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()