添加对 flat 格式的支持

This commit is contained in:
Ing 2025-01-15 14:16:55 +08:00
parent 366e0ad28f
commit 1addd7cd4d
2 changed files with 6 additions and 1 deletions

View File

@ -61,7 +61,7 @@ jobs:
if iscustom == 'false': if iscustom == 'false':
if issuebody.find('DMI') < 0 and issuebody.find('CPU') < 0 and issuebody.find('NIC') < 0: if issuebody.find('DMI') < 0 and issuebody.find('CPU') < 0 and issuebody.find('NIC') < 0:
warinfo = 'true' warinfo = 'true'
set_output("iscustom", iscustom) set_output("iscustom", iscustom)
set_output("warinfo", warinfo) set_output("warinfo", warinfo)
@ -295,6 +295,10 @@ jobs:
qemu-img convert rr/rr.img -O vmdk -o 'adapter_type=lsilogic,subformat=streamOptimized,compat6' rr/rr.vmdk qemu-img convert rr/rr.img -O vmdk -o 'adapter_type=lsilogic,subformat=streamOptimized,compat6' rr/rr.vmdk
(cd rr; sha256sum rr.vmdk >../sha256sum) (cd rr; sha256sum rr.vmdk >../sha256sum)
zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.vmdk.zip" -j rr/rr.vmdk ${USER_CONFIG_FILE} sha256sum README.txt zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.vmdk.zip" -j rr/rr.vmdk ${USER_CONFIG_FILE} sha256sum README.txt
elif [ "${{ env.format }}" = "flat" ]; then
qemu-img convert rr/rr.img -O vmdk -o 'adapter_type=lsilogic,subformat=monolithicFlat,compat6' rr/rr.vmdk
(cd rr; sha256sum rr*.vmdk >../sha256sum)
zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.flat.zip" -j rr/rr*.vmdk ${USER_CONFIG_FILE} sha256sum README.txt
elif [ "${{ env.format }}" = "vhd" ]; then elif [ "${{ env.format }}" = "vhd" ]; then
. scripts/func.sh "${{ secrets.RRORG }}" . scripts/func.sh "${{ secrets.RRORG }}"
qemu-img convert rr/rr.img -O vpc rr/rr.vhd qemu-img convert rr/rr.img -O vpc rr/rr.vhd

View File

@ -292,6 +292,7 @@
<option value="ova">ova</option> <option value="ova">ova</option>
<option value="vmx">vmx</option> <option value="vmx">vmx</option>
<option value="vmdk">vmdk</option> <option value="vmdk">vmdk</option>
<option value="flat">flat</option>
<option value="vhd">vhd</option> <option value="vhd">vhd</option>
<option value="vhdx">vhdx</option> <option value="vhdx">vhdx</option>
</select> </select>