From 89b166c934320deb22175a64203836efddbb04b6 Mon Sep 17 00:00:00 2001 From: zyb Date: Thu, 20 Jun 2024 17:45:18 +0800 Subject: [PATCH] modified: .github/workflows/mikrotik_patch.yml modified: npk.py --- .github/workflows/mikrotik_patch.yml | 20 -------------------- npk.py | 2 +- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/.github/workflows/mikrotik_patch.yml b/.github/workflows/mikrotik_patch.yml index a94255a..e67d091 100644 --- a/.github/workflows/mikrotik_patch.yml +++ b/.github/workflows/mikrotik_patch.yml @@ -206,26 +206,6 @@ jobs: sudo rm -rf ./boot sudo qemu-nbd -d /dev/nbd0 - ( - echo 2 # use GPT - echo t # change partition code - echo 1 # select first partition - echo 8300 # change code to Linux filesystem 8300 - echo r # Recovery/transformation - echo h # Hybrid MBR - echo 1 2 # partitions added to the hybrid MBR - echo n # Place EFI GPT (0xEE) partition first in MBR (good for GRUB)? (Y/N) - echo # Enter an MBR hex code (default 83) - echo y # Set the bootable flag? (Y/N) - echo # Enter an MBR hex code (default 83) - echo n # Set the bootable flag? (Y/N) - echo n # Unused partition space(s) found. Use one to protect more partitions? (Y/N) - echo w # write changes to disk - echo y # confirm - ) | sudo -E gdisk /dev/nbd1 - - sudo qemu-nbd -d /dev/nbd1 - sudo qemu-img convert -f qcow2 -O vmdk chr-$LATEST_VERSION-efi.qcow2 chr-$LATEST_VERSION-efi.vmdk sudo qemu-img convert -f qcow2 -O vpc chr-$LATEST_VERSION-efi.qcow2 chr-$LATEST_VERSION-efi.vhd sudo qemu-img convert -f qcow2 -O vhdx chr-$LATEST_VERSION-efi.qcow2 chr-$LATEST_VERSION-efi.vhdx diff --git a/npk.py b/npk.py index 944bc5d..dfe0318 100644 --- a/npk.py +++ b/npk.py @@ -276,7 +276,7 @@ if __name__=='__main__': print('Invalid') exit(-1) elif args.command =='create': - print(f'Creating option.npk from {args.input}') + print(f'Creating {args.output} from {args.input}') option_npk = NovaPackage.load(args.input) option_npk[NpkPartID.NAME_INFO].data.name = args.name option_npk[NpkPartID.DESCRIPTION].data = args.description.encode() if args.description else args.name.encode()