Compare commits

...

89 Commits

Author SHA1 Message Date
elseif
0f62f5de4e Update mikrotik_patch_7.yml
Signed-off-by: elseif <elseif@live.cn>
2026-03-30 07:55:25 +08:00
elseif
7f2120dca8 Update mikrotik_patch_7.yml
Signed-off-by: elseif <elseif@live.cn>
2026-03-30 04:06:04 +08:00
elseif
9be7cdc6ec Update mikrotik_patch_7.yml
Signed-off-by: elseif <elseif@live.cn>
2026-03-30 04:01:33 +08:00
elseif
b7eccac7c5 Update mikrotik_patch_7.yml
Signed-off-by: elseif <elseif@live.cn>
2026-03-30 03:58:29 +08:00
elseif
e0afc29cca Update mikrotik_patch_7.yml
Signed-off-by: elseif <elseif@live.cn>
2026-03-30 03:53:34 +08:00
elseif
98dfe256e6 Update mikrotik_patch_7.yml
Signed-off-by: elseif <elseif@live.cn>
2026-03-30 03:50:34 +08:00
elseif
f179b74d3e Update wget command to include no-check-certificate option
Signed-off-by: elseif <elseif@live.cn>
2026-03-25 13:06:51 +08:00
elseif
c71a8ff9c1 Update mikrotik_patch_7.yml
Signed-off-by: elseif <elseif@live.cn>
2026-01-10 12:42:37 +08:00
elseif
b35ce475ab Update mikrotik_patch_7.yml
Signed-off-by: elseif <elseif@live.cn>
2026-01-10 12:29:19 +08:00
elseif
976e562e83 Update mikrotik_patch_7.yml
Signed-off-by: elseif <elseif@live.cn>
2026-01-10 11:41:38 +08:00
elseif
86e11b647d Update index.html
Signed-off-by: elseif <elseif@live.cn>
2025-10-22 14:12:58 +08:00
elseif
07c6617805 Update README.md
Signed-off-by: elseif <elseif@live.cn>
2025-10-22 14:09:03 +08:00
elseif
bf2865921a Update README.md
Signed-off-by: elseif <elseif@live.cn>
2025-10-21 18:14:25 +08:00
elseif
604631539c Update README.md
Signed-off-by: elseif <elseif@live.cn>
2025-10-21 17:53:20 +08:00
elseif
fc7bb4f206 Update README.md
Signed-off-by: elseif <elseif@live.cn>
2025-10-21 17:51:22 +08:00
elseif
410c19d2ce Update mikrotik_patch_7.yml
Signed-off-by: elseif <elseif@live.cn>
2025-10-09 11:25:48 +08:00
elseif
d5eea3df4b Update chr.sh
Signed-off-by: elseif <elseif@live.cn>
2025-09-29 11:22:03 +08:00
elseif
73559ce979 Update README.md
Signed-off-by: elseif <elseif@live.cn>
2025-09-28 00:21:06 +08:00
elseif
c54b46c760 Update index.html
Signed-off-by: elseif <elseif@live.cn>
2025-09-26 13:42:03 +08:00
elseif
8603498d39 Update index.html
Signed-off-by: elseif <elseif@live.cn>
2025-09-26 13:29:16 +08:00
elseif
d3fa483c4b Update index.html
Signed-off-by: elseif <elseif@live.cn>
2025-09-26 13:26:27 +08:00
elseif
e338ddb7b2 Update index.html
Signed-off-by: elseif <elseif@live.cn>
2025-09-26 13:15:28 +08:00
elseif
826072d302 Update index.html
Signed-off-by: elseif <elseif@live.cn>
2025-09-26 13:10:28 +08:00
elseif
5eee7b4dbb Update chr.sh
Signed-off-by: elseif <elseif@live.cn>
2025-09-25 19:15:43 +08:00
elseif
1691d01550 Update chr.sh
Signed-off-by: elseif <elseif@live.cn>
2025-09-25 19:13:01 +08:00
elseif
4543b7b3b2 Update chr.sh
Signed-off-by: elseif <elseif@live.cn>
2025-09-25 19:07:44 +08:00
elseif
3cddd9e6fb Update chr.sh
Signed-off-by: elseif <elseif@live.cn>
2025-09-25 18:47:24 +08:00
elseif
3fb99a94ac Update chr.sh
Signed-off-by: elseif <elseif@live.cn>
2025-09-25 18:44:44 +08:00
elseif
356575af79 Update chr.sh
Signed-off-by: elseif <elseif@live.cn>
2025-09-25 16:56:06 +08:00
elseif
58970bd829 Update chr.sh
Signed-off-by: elseif <elseif@live.cn>
2025-09-25 16:47:18 +08:00
elseif
6e8d5cf26c Update chr.sh
Signed-off-by: elseif <elseif@live.cn>
2025-09-25 16:45:03 +08:00
elseif
502136464a Update README.md
Signed-off-by: elseif <elseif@live.cn>
2025-09-25 10:10:52 +08:00
elseif
6b7d1a849f Update README.md
Signed-off-by: elseif <elseif@live.cn>
2025-09-25 10:04:34 +08:00
elseif
77f07bbf27 Update README.md
Signed-off-by: elseif <elseif@live.cn>
2025-09-25 09:45:43 +08:00
elseif
06a9d80798 Update README.md
Signed-off-by: elseif <elseif@live.cn>
2025-09-25 09:14:16 +08:00
elseif
3c2e1197ce Update chr.sh
Signed-off-by: elseif <elseif@live.cn>
2025-09-24 20:59:05 +08:00
elseif
befaa60509 Update README.md
Signed-off-by: elseif <elseif@live.cn>
2025-09-24 20:56:13 +08:00
elseif
1a2f73d363 Update README.md
Signed-off-by: elseif <elseif@live.cn>
2025-09-24 19:36:08 +08:00
elseif
e7063fdcbd Update README.md
Signed-off-by: elseif <elseif@live.cn>
2025-09-24 19:19:08 +08:00
elseif
b26437cb47 Update README.md
Signed-off-by: elseif <elseif@live.cn>
2025-09-24 18:30:41 +08:00
elseif
b6c24eb657 Update chr.sh
Signed-off-by: elseif <elseif@live.cn>
2025-09-24 18:21:53 +08:00
elseif
f1d3c640f8 Update README.md
Signed-off-by: elseif <elseif@live.cn>
2025-09-24 18:17:55 +08:00
elseif
2f627420a2 Update chr.sh
Signed-off-by: elseif <elseif@live.cn>
2025-09-24 14:16:40 +08:00
zyb
482041cac3 modified: index.html 2025-09-24 13:50:40 +08:00
zyb
c139e9012a modified: chr.sh 2025-09-24 13:31:41 +08:00
zyb
89e9e0a92e modified: chr.sh 2025-09-24 13:14:08 +08:00
zyb
9ad1b924a1 modified: chr.sh 2025-09-24 13:09:15 +08:00
elseif
68c53e4a19 Update README.md
Signed-off-by: elseif <elseif@live.cn>
2025-09-22 12:25:11 +08:00
elseif
e70a8aff16 Update README.md
Signed-off-by: elseif <elseif@live.cn>
2025-09-22 12:24:06 +08:00
elseif
1b857342ba Update README.md
Signed-off-by: elseif <elseif@live.cn>
2025-09-22 12:23:53 +08:00
elseif
4b4b257b4a Update README.md
Signed-off-by: elseif <elseif@live.cn>
2025-09-22 12:23:29 +08:00
elseif
597cbf30d8 Update README.md
Signed-off-by: elseif <elseif@live.cn>
2025-09-22 02:23:17 +08:00
elseif
6d7f3c0fd7 Update README.md
Signed-off-by: elseif <elseif@live.cn>
2025-09-22 02:22:46 +08:00
elseif
fc6fc897e1 Update README.md
Signed-off-by: elseif <elseif@live.cn>
2025-09-22 00:37:36 +08:00
elseif
0f45d580ba Update README.md
Signed-off-by: elseif <elseif@live.cn>
2025-09-22 00:34:33 +08:00
elseif
930a496ce4 Add files via upload
Signed-off-by: elseif <elseif@live.cn>
2025-09-21 22:26:54 +08:00
elseif
b7f321f748 Delete keygen/keygen_arm
Signed-off-by: elseif <elseif@live.cn>
2025-09-21 22:26:38 +08:00
elseif
f9662f6d23 Add files via upload
Signed-off-by: elseif <elseif@live.cn>
2025-09-21 22:26:25 +08:00
elseif
db5c0c3c8f Delete keygen/keygen_x86
Signed-off-by: elseif <elseif@live.cn>
2025-09-21 22:26:09 +08:00
elseif
93455ac7e7 Delete keygen/keygen_aarch64
Signed-off-by: elseif <elseif@live.cn>
2025-09-21 22:26:01 +08:00
elseif
29e25d9e8a Add files via upload
Signed-off-by: elseif <elseif@live.cn>
2025-09-21 22:23:40 +08:00
elseif
30a45fc829 Delete keygen/keygen_arm
Signed-off-by: elseif <elseif@live.cn>
2025-09-21 22:23:23 +08:00
elseif
9d91a8348d Add files via upload
Signed-off-by: elseif <elseif@live.cn>
2025-09-21 22:23:07 +08:00
elseif
66877c2071 Delete keygen/keygen_x86
Signed-off-by: elseif <elseif@live.cn>
2025-09-21 22:22:41 +08:00
elseif
671ad79933 Delete keygen/keygen_aarch64
Signed-off-by: elseif <elseif@live.cn>
2025-09-21 22:22:30 +08:00
elseif
61ba016da0 Update chr.sh
Signed-off-by: elseif <elseif@live.cn>
2025-09-19 23:28:40 +08:00
elseif
96d23defd3 Merge pull request #148 from FakeErrorX/main
Enhance UI with changelog modal and improved comments
2025-09-19 13:44:05 +08:00
ErrorX
5e80b52278 Merge branch 'main' into main
Signed-off-by: ErrorX <99178547+FakeErrorX@users.noreply.github.com>
2025-09-19 11:39:35 +06:00
ErrorX
54252e8645 Enhance UI with changelog modal and improved comments
Added a popup modal for viewing changelogs directly within the page, including loading and error states. Improved code readability with detailed comments, enhanced footer with banner-style social links, and clarified section headers and UI element purposes throughout the HTML and JavaScript. Also updated download links to use the changelog modal and improved GitHub proxy handling.
2025-09-19 11:32:05 +06:00
elseif
f03d0300d2 Update index.html
Signed-off-by: elseif <elseif@live.cn>
2025-09-19 13:07:29 +08:00
elseif
8281f0193f Update index.html
Signed-off-by: elseif <elseif@live.cn>
2025-09-19 13:02:02 +08:00
elseif
500c7b5748 Update index.html
Signed-off-by: elseif <elseif@live.cn>
2025-09-19 12:27:07 +08:00
elseif
e5b8288b35 Update index.html
Signed-off-by: elseif <elseif@live.cn>
2025-09-19 12:23:54 +08:00
elseif
fe493a8f0f Update index.html
Signed-off-by: elseif <elseif@live.cn>
2025-09-19 12:07:24 +08:00
elseif
e8bd998953 Update index.html
Signed-off-by: elseif <elseif@live.cn>
2025-09-19 12:05:41 +08:00
elseif
9ad4028007 Update mikrotik_patch_7.yml
Signed-off-by: elseif <elseif@live.cn>
2025-09-19 10:59:11 +08:00
elseif
f55fba6699 Update patch.py
Signed-off-by: elseif <elseif@live.cn>
2025-09-19 01:03:56 +08:00
elseif
e2debac366 Update patch.py
Signed-off-by: elseif <elseif@live.cn>
2025-09-19 00:59:40 +08:00
elseif
7fe82f7498 Update mikrotik_patch_7.yml
Signed-off-by: elseif <elseif@live.cn>
2025-09-19 00:32:10 +08:00
elseif
e7a08895f5 Update mikrotik_patch_6.yml
Signed-off-by: elseif <elseif@live.cn>
2025-09-18 23:35:16 +08:00
elseif
b436141665 Update index.html
Signed-off-by: elseif <elseif@live.cn>
2025-09-18 23:29:20 +08:00
elseif
86e2727c56 Update mikrotik_patch_6.yml
Signed-off-by: elseif <elseif@live.cn>
2025-09-18 23:15:40 +08:00
elseif
96670cbe60 Update npk.py
Signed-off-by: elseif <elseif@live.cn>
2025-09-18 23:04:30 +08:00
elseif
f91f8e15d0 Merge pull request #145 from FakeErrorX/main
Redesign index.html
2025-09-18 16:49:01 +08:00
elseif
c4dd46205b Update mikrotik_patch_6.yml
Signed-off-by: elseif <elseif@live.cn>
2025-09-18 16:35:11 +08:00
elseif
4f9d2133fd Update npk.py
Signed-off-by: elseif <elseif@live.cn>
2025-09-18 16:33:57 +08:00
ErrorX
b6721ffd7d Redesign index.html
Replaces legacy CSS and table-based layout with modernizes the UI with responsive cards, details/summary accordions, and improved theme/language switching. Adds dynamic loading, new download tables, and enhanced accessibility. Removes old inline styles and scripts, streamlining the code for maintainability and better user experience.
2025-09-16 15:08:43 +06:00
elseif
6cbdbffbcb Update chr.sh
Signed-off-by: elseif <elseif@live.cn>
2025-09-13 03:43:55 +08:00
elseif
6d27075389 Update index.html
Signed-off-by: elseif <elseif@live.cn>
2025-09-13 03:39:43 +08:00
10 changed files with 1138 additions and 1020 deletions

View File

@@ -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

View File

@@ -22,6 +22,7 @@ on:
type: choice
options:
- stable
- long-term
- testing
version:
description: "Specify version (e.g., 7.19.2), empty for latest"
@@ -87,7 +88,7 @@ jobs:
BUILD_TIME=$(date +'%s')
RELEASE=true
MATRIX_JSON='[{"arch":"x86","channel":"stable"},{"arch":"arm64","channel":"stable"},{"arch":"arm","channel":"stable"},{"arch":"x86","channel":"testing"},{"arch":"arm64","channel":"testing"},{"arch":"arm","channel":"testing"}]'
MATRIX_JSON='[{"arch":"x86","channel":"stable"},{"arch":"arm64","channel":"stable"},{"arch":"x86","channel":"testing"},{"arch":"arm64","channel":"testing"}]'
MATRIX_JSON='[{"arch":"x86","channel":"stable"},{"arch":"arm64","channel":"stable"},{"arch":"x86","channel":"long-term"},{"arch":"arm64","channel":"long-term"},{"arch":"x86","channel":"testing"},{"arch":"arm64","channel":"testing"}]'
fi
echo "BUILD_TIME=$BUILD_TIME" >> $GITHUB_OUTPUT
echo "RELEASE=$RELEASE" >> $GITHUB_OUTPUT
@@ -190,11 +191,11 @@ jobs:
sudo mksquashfs option-root option.sfs -quiet -comp xz -no-xattrs -b 256k
sudo rm -rf option-root
if [ "${{ matrix.arch }}" == "x86" ]; then
sudo wget -O cpython.tar.gz -nv https://github.com/indygreg/python-build-standalone/releases/download/20250708/cpython-3.11.13+20250708-x86_64-unknown-linux-musl-install_only_stripped.tar.gz
sudo wget -O cpython.tar.gz -nv https://github.com/astral-sh/python-build-standalone/releases/download/20241206/cpython-3.11.11+20241206-x86_64-unknown-linux-musl-install_only_stripped.tar.gz
elif [ "${{ matrix.arch }}" == "arm64" ]; then
sudo wget -O cpython.tar.gz -nv https://github.com/indygreg/python-build-standalone/releases/download/20250708/cpython-3.11.13+20250708-aarch64-unknown-linux-gnu-install_only_stripped.tar.gz
sudo wget -O cpython.tar.gz -nv https://github.com/indygreg/python-build-standalone/releases/download/20241206/cpython-3.11.11+20241206-aarch64-unknown-linux-gnu-install_only_stripped.tar.gz
elif [ "${{ matrix.arch }}" == "arm" ]; then
sudo wget -O cpython.tar.gz -nv https://github.com/indygreg/python-build-standalone/releases/download/20250708/cpython-3.11.13+20250708-armv7-unknown-linux-gnueabi-install_only_stripped.tar.gz
sudo wget -O cpython.tar.gz -nv https://github.com/indygreg/python-build-standalone/releases/download/20241206/cpython-3.11.11+20241206-armv7-unknown-linux-gnueabi-install_only_stripped.tar.gz
fi
sudo tar -xf cpython.tar.gz
sudo rm cpython.tar.gz
@@ -218,6 +219,18 @@ jobs:
run: |
sudo wget -nv -O mikrotik.iso https://download.mikrotik.com/routeros/$LATEST_VERSION/mikrotik-$LATEST_VERSION$ARCH.iso
- name: Cache refind
if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch == 'x86'
id: cache-refind
uses: actions/cache@v4
with:
path: refind-bin-0.14.2.zip
key: refind
restore-keys: refind
- name: Get refind
if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch == 'x86' && steps.cache-refind.outputs.cache-hit != 'true'
run: sudo wget --no-check-certificate -nv -O refind-bin-0.14.2.zip https://nchc.dl.sourceforge.net/project/refind/0.14.2/refind-bin-0.14.2.zip
- name: Patch mikrotik-${{ env.LATEST_VERSION }}${{ env.ARCH }}.iso
if: steps.get_latest.outputs.has_new_version == 'true' && (matrix.arch == 'x86' || matrix.arch == 'arm64')
@@ -246,18 +259,39 @@ jobs:
sudo -E python3 npk.py sign "$file" "$file"
done
fi
if [ "$LATEST_VERSION" = "7.12.1" ]; then
URL="https://download.mikrotik.com/routeros/$LATEST_VERSION/routeros-${{ matrix.arch }}-$LATEST_VERSION.npk"
sudo wget -nv -O "routeros-${{ matrix.arch }}-$LATEST_VERSION.npk" "$URL"
sudo -E python3 patch.py npk routeros-${{ matrix.arch }}-$LATEST_VERSION.npk
sudo mv "routeros-${{ matrix.arch }}-$LATEST_VERSION.npk" ./new_iso
URL="https://download.mikrotik.com/routeros/$LATEST_VERSION/system-$LATEST_VERSION.npk"
sudo wget -nv -O "system-$LATEST_VERSION.npk" "$URL"
sudo -E python3 patch.py npk system-$LATEST_VERSION.npk
sudo mv "system-$LATEST_VERSION.npk" ./new_iso
fi
sudo cp -f routeros-$LATEST_VERSION$ARCH.npk ./new_iso/
sudo -E python3 npk.py create ./new_iso/gps-$LATEST_VERSION$ARCH.npk ./option-$LATEST_VERSION$ARCH.npk option ./option.sfs -desc="busybox"
sudo cp option-$LATEST_VERSION$ARCH.npk ./new_iso/
sudo -E python3 npk.py create ./new_iso/gps-$LATEST_VERSION$ARCH.npk ./python3-$LATEST_VERSION$ARCH.npk python3 ./python3.sfs -desc="python 3.11.13"
sudo cp python3-$LATEST_VERSION$ARCH.npk ./new_iso/
sudo mkdir ./efiboot
sudo mount -o loop ./new_iso/efiboot.img ./efiboot
if [ "${{ matrix.arch }}" == "x86" ]; then
sudo -E python3 patch.py kernel ./efiboot/linux.x86_64
sudo cp ./efiboot/linux.x86_64 ./BOOTX64.EFI
sudo cp ./BOOTX64.EFI ./new_iso/isolinux/linux
sudo umount ./efiboot
truncate --size 32M efiboot.img
sudo mkfs.fat -F16 -n ROUTEROS efiboot.img
sudo mount -o loop efiboot.img efiboot
sudo mkdir -p efiboot/EFI/BOOT
sudo unzip refind-bin-0.14.2.zip refind-bin-0.14.2/refind/refind_x64.efi
sudo cp refind-bin-0.14.2/refind/refind_x64.efi ./efiboot/EFI/BOOT/BOOTX64.EFI
sudo rm -rf refind-bin-0.14.2
echo -e 'timeout 0\ntextonly\ntextmode 0\nshowtools shutdown, reboot, exit\nmenuentry "Install RouterOS" {\n\tloader /linux.x86_64\n\toptions "load_ramdisk=1 root=/dev/ram0 -install -cdrom debug"\n}\ndefault_selection /EFI/BOOT/BOOTX64.EFI' \
> refind.conf
sudo cp refind.conf ./efiboot/EFI/BOOT/
sudo rm refind.conf
sudo -E python3 patch.py kernel ./new_iso/isolinux/linux
sudo cp ./new_iso/isolinux/linux ./efiboot/linux.x86_64
sudo cp ./new_iso/isolinux/linux ./linux.x86_64
sudo umount ./efiboot
sudo cp -f efiboot.img ./new_iso/efiboot.img
sudo mkisofs -o mikrotik-$LATEST_VERSION$ARCH.iso \
-V "MikroTik $LATEST_VERSION ${{ matrix.arch }}" \
-sysid "" -preparer "MiKroTiK" \
@@ -274,6 +308,7 @@ jobs:
-R -J \
./new_iso
elif [ "${{ matrix.arch }}" == "arm64" ]; then
sudo mount -o loop ./new_iso/efiboot.img ./efiboot
sudo -E python3 patch.py kernel ./efiboot/EFI/BOOT/BOOTAA64.EFI
sudo umount ./efiboot
sudo xorriso -as mkisofs -o mikrotik-$LATEST_VERSION$ARCH.iso \
@@ -322,7 +357,7 @@ jobs:
</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}"/>
<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"/>
</DiskSection>
<NetworkSection>
<Info>The list of logical networks</Info>
@@ -404,7 +439,7 @@ jobs:
</VirtualHardwareSection>
<AnnotationSection ovf:required="false">
<Info>A human-readable annotation</Info>
<Annotation>MikroTik RouterOS CHR v7.19.4</Annotation>
<Annotation>MikroTik RouterOS CHR</Annotation>
</AnnotationSection>
</VirtualSystem>
</Envelope>'
@@ -595,19 +630,6 @@ jobs:
sudo zip ../all_packages-${{ matrix.arch }}-$LATEST_VERSION.zip *.npk
cd ..
- name: Cache refind
if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch == 'x86' && env.RELEASE == 'true'
id: cache-refind
uses: actions/cache@v4
with:
path: refind-bin-0.14.2.zip
key: refind
restore-keys: refind
- name: Get refind
if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch == 'x86' && steps.cache-refind.outputs.cache-hit != 'true' && env.RELEASE == 'true'
run: sudo wget -nv -O refind-bin-0.14.2.zip https://nchc.dl.sourceforge.net/project/refind/0.14.2/refind-bin-0.14.2.zip
- name: Create install-image-${{ env.LATEST_VERSION }}${{ env.ARCH }}.img
if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch == 'x86' && env.RELEASE == 'true'
run: |
@@ -631,7 +653,7 @@ jobs:
> syslinux.cfg
sudo cp syslinux.cfg ./install/
sudo rm syslinux.cfg
sudo cp ./BOOTX64.EFI ./install/linux
sudo cp ./linux.x86_64 ./install/linux
NPK_FILES=($(find ./all_packages/*.npk))
for ((i=1; i<=${#NPK_FILES[@]}; i++))
do
@@ -670,9 +692,9 @@ jobs:
sudo unzip netinstall.zip
sudo -E python3 patch.py netinstall netinstall.exe
sudo zip netinstall-$LATEST_VERSION.zip ./netinstall.exe
sudo tar -xvf netinstall.tar.gz
sudo -E python3 patch.py netinstall netinstall-cli
sudo tar -czvf netinstall-$LATEST_VERSION.tar.gz ./netinstall-cli
# sudo tar -xvf netinstall.tar.gz
# sudo -E python3 patch.py netinstall netinstall-cli
# sudo tar -czvf netinstall-$LATEST_VERSION.tar.gz ./netinstall-cli
- name: Prepare for Upload
if: steps.get_latest.outputs.has_new_version == 'true' && env.RELEASE == 'true'

View File

@@ -1,6 +1,11 @@
[![Patch Mikrotik RouterOS 6.x](https://github.com/elseif/MikroTikPatch/actions/workflows/mikrotik_patch_6.yml/badge.svg)](https://github.com/elseif/MikroTikPatch/actions/workflows/mikrotik_patch_6.yml)
[![Patch Mikrotik RouterOS 7.x](https://github.com/elseif/MikroTikPatch/actions/workflows/mikrotik_patch_7.yml/badge.svg)](https://github.com/elseif/MikroTikPatch/actions/workflows/mikrotik_patch_7.yml)
### 感谢赞助
[![DigitalOcean Referral Badge](https://web-platforms.sfo2.cdn.digitaloceanspaces.com/WWW/Badge%201.svg)](https://www.digitalocean.com/?refcode=dbf6ed365068&utm_campaign=Referral_Invite&utm_medium=Referral_Program&utm_source=badge)
[DartNode(aff)](https://dartnode.com?aff=SnazzyLobster067) | [ZMTO(aff)](https://console.zmto.com/?affid=1588) | [Vultr(aff)](https://www.vultr.com/?ref=9807160-9J)
# MikroTik RouterOS Patch [[English](README_EN.md)]
[![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)
@@ -60,8 +65,9 @@ graph TD
## 所有的修补操作都自动运行在[Github Action](https://github.com/elseif/MikroTikPatch/blob/main/.github/workflows/)。
### 感谢赞助
[ZMTO](https://console.zmto.com)

408
chr.sh
View File

@@ -1,82 +1,346 @@
#!/bin/bash
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"
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
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')
echo "ETH: $ETH"
ADDRESS=$(ip addr show $ETH | grep global | cut -d' ' -f 6 | head -n 1)
echo "ADDRESS: $ADDRESS"
GATEWAY=$(ip route list | grep default | cut -d' ' -f 3)
echo "GATEWAY: $GATEWAY"
DNS=$(grep '^nameserver' /etc/resolv.conf | awk '{print $2}' | head -n 1)
[ -z "$DNS" ] && DNS="8.8.8.8"
echo "DNS: $DNS"
_ask() {
local _redo=0
echo "FILE: $(basename $IMG_URL)"
if command -v wget >/dev/null 2>&1; then
wget --no-check-certificate -O /tmp/chr.img.zip "$IMG_URL" || { echo "Download failed!"; exit 1; }
elif command -v curl >/dev/null 2>&1; then
curl -L --insecure -o /tmp/chr.img.zip "$IMG_URL" || { echo "Download failed!"; exit 1; }
else
echo "Neither wget nor curl is installed. Cannot download $url"
exit 1
fi
cd /tmp
gunzip -c chr.img.zip > chr.img
RANDOM_PASS=$(tr -dc 'A-Za-z0-9' </dev/urandom | head -c 8)
if LOOP=$(losetup -Pf --show chr.img 2>/dev/null); then
sleep 3
MNT=/tmp/chr
mkdir -p $MNT
if mount ${LOOP}p2 $MNT 2>/dev/null; then
cat <<EOF | tee $MNT/rw/autorun.scr
read resp
case "$resp" in
!) echo "Type 'exit' to return to setup."
sh
_redo=1
;;
!*) eval "${resp#?}"
_redo=1
;;
esac
return $_redo
}
ask() {
local _question="$1" _default="$2"
while :; do
printf %s "$_question "
[ -z "$_default" ] || printf "[%s] " "$_default"
_ask && : ${resp:=$_default} && break
done
}
ask_until() {
resp=
while [ -z "$resp" ] ; do
ask "$1" "$2"
done
}
yesno() {
case $1 in
[Yy]) return 0;;
esac
return 1
}
ask_yesno() {
while true; do
ask "$1" "$2"
case "$resp" in
Y|y|N|n) break;;
esac
done
yesno "$resp"
}
select_language() {
while true; do
echo "Select your language:"
echo "1. English"
echo "2. 简体中文"
ask_until "Please choose an option" "1"
case $resp in
1)
MSG_ARCH="Arch:"
MSG_BOOTMODE="BootMode:"
MSG_STORAGE_DEVICE="Input storage device name:"
MSG_ADDRESS="Input IP address:"
MSG_GATEWAY="Input gateway:"
MSG_DNS="Input domain name server:"
MSG_SELECT_VERSION="Select the version you want to install:"
MSG_STABLE="stable (v7)"
MSG_TEST="testing (v7)"
MSG_LTS="long-term (v6)"
MSG_STABLE6="stable (v6)"
MSG_PLEASE_CHOOSE="Please choose an option:"
MSG_UNSUPPORTED_ARCH="Error: Unsupported architecture: "
MSG_INVALID_OPTION="Error: Invalid option!"
MSG_ARM64_NOT_SUPPORT_V6="arm64 does not support v6 version for now."
MSG_SELECTED_VERSION="Selected version:"
MSG_FILE_DOWNLOAD="Download file: "
MSG_DOWNLOAD_ERROR="Error: No wget nor curl is installed. Cannot download."
MSG_EXTRACT_ERROR="Error: No unzip nor gunzip is installed. Cannot uncompress."
MSG_DOWNLOAD_FAILED="Error: Download failed!"
MSG_OPERATION_ABORTED="Error: Operation aborted."
MSG_WARNING="Warn: All data on /dev/%s will be lost!"
MSG_REBOOTING="Ok, rebooting..."
MSG_ADMIN_PASSWORD="admin password:"
MSG_MANUAL_PASS_CHOICE="Do you want to enter a password manually? (y/N): "
MSG_ENTER_NEW_PASS="Enter new password: "
MSG_PASS_EMPTY="Password cannot be empty, please try again."
MSG_ERROR_MOUNT="Error: Failed to mount partition"
MSG_ERROR_LOOP="Error: Failed to setup loop device"
MSG_AUTO_RUN_FILE_CREATED="autorun.scr file created."
MSG_AUTO_RUN_FILE_NOT_CREATED="Warn: autorun.scr file create failed"
MSG_CONFIRM_CONTINUE="Do you want to continue? [y/n]"
;;
2)
MSG_ARCH="CPU架构:"
MSG_BOOTMODE="引导模式:"
MSG_STORAGE_DEVICE="输入存储设备名称:"
MSG_ADDRESS="输入IP地址:"
MSG_GATEWAY="输入网关地址:"
MSG_DNS="输入DNS服务器:"
MSG_SELECT_VERSION="请选择您要安装的版本:"
MSG_STABLE="稳定版 (v7)"
MSG_TEST="测试版 (v7)"
MSG_LTS="长期支持版 (v6)"
MSG_STABLE6="稳定版 (v6)"
MSG_PLEASE_CHOOSE="请选择一个选项:"
MSG_UNSUPPORTED_ARCH="错误: 不支持的架构: "
MSG_INVALID_OPTION="错误: 无效选项"
MSG_ARM64_NOT_SUPPORT_V6="ARM64架构暂不支持安装v6版本"
MSG_SELECTED_VERSION="已选择版本:"
MSG_FILE_DOWNLOAD="下载文件: "
MSG_DOWNLOAD_ERROR="错误: wget 或 curl 都未安装,无法下载文件。"
MSG_EXTRACT_ERROR="错误: unzip 或 gunzip 都未安装,无法解压文件。"
MSG_DOWNLOAD_FAILED="错误: 下载失败!"
MSG_OPERATION_ABORTED="错误: 操作已中止。"
MSG_WARNING="警告:/dev/%s 上的数据将会丢失!"
MSG_REBOOTING="好的,正在重启..."
MSG_ADMIN_PASSWORD="管理员密码:"
MSG_MANUAL_PASS_CHOICE="是否手动输入密码?(y/N): "
MSG_ENTER_NEW_PASS="请输入新密码: "
MSG_PASS_EMPTY="密码不能为空,请重新输入。"
MSG_ERROR_MOUNT="错误: 挂载分区失败"
MSG_ERROR_LOOP="错误: 设置 loop 设备失败"
MSG_AUTO_RUN_FILE_CREATED="autorun.scr 文件已创建。"
MSG_AUTO_RUN_FILE_NOT_CREATED="警告autorun.scr 文件创建失败!"
MSG_CONFIRM_CONTINUE="您是否确定继续? [y/n]"
;;
*)
echo "Error: Invalid option!"
continue
;;
esac
break
done
}
show_system_info() {
ARCH=$(uname -m)
BOOT_MODE=$( [ -d "/sys/firmware/efi" ] && echo "UEFI" || echo "BIOS" )
echo "$MSG_ARCH $ARCH"
echo "$MSG_BOOTMODE $BOOT_MODE"
}
confirm_storge() {
if command -v lsblk >/dev/null 2>&1; then
STORAGE=$(lsblk -d -n -o NAME,TYPE | awk '$2=="disk"{print $1; exit}')
else
STORAGE=$(fdisk -l | awk '/^Disk \/dev/ {print $2; exit}' | sed 's#:##' | sed 's#/dev/##')
fi
ask_until "$MSG_STORAGE_DEVICE" "$STORAGE"
STORAGE=$resp
}
confirm_address() {
ETH=$(ip route show default | grep '^default' | sed -n 's/.* dev \([^\ ]*\) .*/\1/p')
ADDRESS=$(ip addr show $ETH | grep global | cut -d' ' -f 6 | head -n 1)
GATEWAY=$(ip route list | grep default | cut -d' ' -f 3)
if [ -f "/etc/resolv.conf" ]; then
DNS=$(grep '^nameserver' /etc/resolv.conf | awk '{print $2}' | head -n 1)
fi
[ -z "$DNS" ] && DNS="8.8.8.8"
ask_until "$MSG_ADDRESS" "$ADDRESS"
ADDRESS=$resp
ask_until "$MSG_GATEWAY" "$GATEWAY"
GATEWAY=$resp
ask_until "$MSG_DNS" "$DNS"
DNS=$resp
}
http_get() {
local url=$1
local dest_file=$2
if command -v curl >/dev/null 2>&1; then
if [ -z "$dest_file" ]; then
curl -Ls "$url"
else
curl -L -# -o "$dest_file" "$url" || { echo "$MSG_DOWNLOAD_FAILED"; exit 1; }
fi
elif command -v wget >/dev/null 2>&1; then
if [ -z "$dest_file" ]; then
wget --no-check-certificate -qO- "$url"
else
wget --no-check-certificate -O "$dest_file" "$url" || { echo "$MSG_DOWNLOAD_FAILED"; exit 1; }
fi
else
echo "$MSG_DOWNLOAD_ERROR"
exit 1
fi
}
extract_zip() {
local zip_file=$1
local dest_file=$2
if command -v unzip >/dev/null 2>&1; then
unzip -p "$zip_file" > "$dest_file" || { echo "$MSG_EXTRACT_ERROR"; exit 1; }
elif command -v gunzip >/dev/null 2>&1; then
gunzip -c "$zip_file" > "$dest_file" || { echo "$MSG_EXTRACT_ERROR"; exit 1; }
else
echo "$MSG_EXTRACT_ERROR"
exit 1
fi
}
select_version() {
if [[ -n "$VERSION" ]]; then
if [[ "$VERSION" == 7.* ]]; then
V7=1
elif [[ "$VERSION" == 6.* ]]; then
V7=0
else
echo "Error: Unsupported version $VERSION"
exit 1
fi
echo "$MSG_SELECTED_VERSION $VERSION"
return
fi
while true; do
case $ARCH in
x86_64|i386|i486|i586|i686)
echo "$MSG_SELECT_VERSION"
echo "1. $MSG_STABLE"
echo "2. $MSG_TEST"
echo "3. $MSG_LTS"
echo "4. $MSG_STABLE6"
read -p "$MSG_PLEASE_CHOOSE [1-4]" version_choice
;;
aarch64)
echo "$MSG_SELECT_VERSION"
echo "1. $MSG_STABLE"
echo "2. $MSG_TEST"
read -p "$MSG_PLEASE_CHOOSE [1-2]" version_choice
;;
*)
echo "$MSG_UNSUPPORTED_ARCH $ARCH"
exit 1
;;
esac
case $version_choice in
1)
VERSION=$(http_get "https://upgrade.mikrotik.ltd/routeros/NEWESTa7.stable" | cut -d' ' -f1)
V7=1
;;
2)
VERSION=$(http_get "https://upgrade.mikrotik.ltd/routeros/NEWESTa7.testing" | cut -d' ' -f1)
V7=1
;;
3)
if [[ "$ARCH" == "aarch64" ]]; then
echo "$MSG_ARM64_NOT_SUPPORT_V6"
continue
fi
VERSION=$(http_get "https://upgrade.mikrotik.ltd/routeros/NEWEST6.long-term" | cut -d' ' -f1)
V7=0
;;
4)
if [[ "$ARCH" == "aarch64" ]]; then
echo "$MSG_ARM64_NOT_SUPPORT_V6"
continue
fi
VERSION=$(http_get "https://upgrade.mikrotik.ltd/routeros/NEWEST6.stable" | cut -d' ' -f1)
V7=0
;;
*)
echo "$MSG_INVALID_OPTION"
continue
;;
esac
echo "$MSG_SELECTED_VERSION $VERSION"
break
done
}
download_image(){
case $ARCH in
x86_64|i386|i486|i586|i686)
if [[ $V7 == 1 && $BOOT_MODE == "BIOS" ]]; then
IMG_URL="https://github.com/elseif/MikroTikPatch/releases/download/$VERSION/chr-$VERSION-legacy-bios.img.zip"
else
IMG_URL="https://github.com/elseif/MikroTikPatch/releases/download/$VERSION/chr-$VERSION.img.zip"
fi
;;
aarch64)
IMG_URL="https://github.com/elseif/MikroTikPatch/releases/download/$VERSION-arm64/chr-$VERSION-arm64.img.zip"
;;
*)
echo "$MSG_UNSUPPORTED_ARCH"
exit 1
;;
esac
echo "$MSG_FILE_DOWNLOAD $(basename "$IMG_URL")"
http_get "$IMG_URL" "/tmp/chr.img.zip"
cd /tmp
extract_zip "chr.img.zip" chr.img
}
create_autorun() {
if LOOP=$(losetup -Pf --show chr.img 2>/dev/null); then
sleep 1
MNT=/tmp/chr
mkdir -p $MNT
PARTITION=$([ "$V7" == 1 ] && echo "p2" || echo "p1")
if mount "${LOOP}${PARTITION}" "$MNT" 2>/dev/null; then
confirm_address
RANDOM_ADMIN_PASS=$(tr -dc 'A-Za-z0-9' </dev/urandom | head -c 16)
ask_until "$MSG_ADMIN_PASSWORD" "$RANDOM_ADMIN_PASS"
RANDOM_ADMIN_PASS=$resp
cat <<EOF > "$MNT/rw/autorun.scr"
/user set admin password="$RANDOM_ADMIN_PASS"
/ip dns set servers=$DNS
/ip address add address=$ADDRESS interface=ether1
/ip route add gateway=$GATEWAY
/ip dns set servers=$DNS
/user set admin password="$RANDOM_PASS"
EOF
echo "autorun.scr file created."
echo -e "admin password: \e[31m$RANDOM_PASS\e[0m"
umount $MNT
echo "$MSG_AUTO_RUN_FILE_CREATED"
umount $MNT
losetup -d "$LOOP"
else
losetup -d "$LOOP"
echo "$MSG_ERROR_MOUNT $PARTITION"
echo "$MSG_AUTO_RUN_FILE_NOT_CREATED"
fi
else
echo "Failed to mount partition 2, skipping autorun.scr creation."
echo "$MSG_ERROR_LOOP"
echo "$MSG_AUTO_RUN_FILE_NOT_CREATED"
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 < /dev/tty
confirm=${confirm:-Y}
if [[ "$confirm" =~ ^[Nn]$ ]]; then
echo "Operation aborted."
exit 1
fi
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
write_and_reboot() {
confirm_storge
printf "$MSG_WARNING\n" "$STORAGE"
ask_yesno "$MSG_CONFIRM_CONTINUE"
if [ $? -ne 0 ]; then
echo "$MSG_OPERATION_ABORTED"
exit 1
fi
dd if=chr.img of=/dev/$STORAGE bs=4M conv=fsync
echo "$MSG_REBOOTING"
echo 1 > /proc/sys/kernel/sysrq 2>/dev/null || true
echo b > /proc/sysrq-trigger 2>/dev/null || true
reboot -f
}
select_language
show_system_info
select_version
download_image
create_autorun
write_and_reboot
exit 0

1595
index.html

File diff suppressed because it is too large Load Diff

Binary file not shown.

Binary file not shown.

Binary file not shown.

51
npk.py
View File

@@ -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:

View File

@@ -328,6 +328,12 @@ def patch_squashfs(path,key_dict):
if _file =='loader':
patch_loader(file)
continue
if _file =='BOOTX64.EFI':
print(f'patch {file} ...')
data = open(file,'rb').read()
data = patch_kernel(data,key_dict)
open(file,'wb').write(data)
continue
data = open(file,'rb').read()
for old_public_key,new_public_key in key_dict.items():
_data = replace_key(old_public_key,new_public_key,data,file)