File tree Expand file tree Collapse file tree 3 files changed +7
-1
lines changed Expand file tree Collapse file tree 3 files changed +7
-1
lines changed Original file line number Diff line number Diff line change @@ -243,6 +243,9 @@ image-type: "${image_type}"
243
243
ostree-repo: "${ostree_repo} "
244
244
metal-image-size: "${metal_image_size_mb} "
245
245
cloud-image-size: "${cloud_image_size_mb} "
246
+ # Note: this is only used in the secex case; there, the rootfs is
247
+ # not the last partition on the disk so we need to explicitly size it
248
+ rootfs-size: "${rootfs_size_mb} "
246
249
EOF
247
250
yaml2json " ${image_dynamic_yaml} " " ${image_dynamic_json} "
248
251
cat " ${image_json} " " ${image_dynamic_json} " | jq -s add > " ${image_for_disk_json} "
Original file line number Diff line number Diff line change @@ -17,7 +17,8 @@ mpp-vars:
17
17
efi_system_size_mb : 127
18
18
se_size_mb : 200
19
19
boot_size_mb : 384
20
- root_size_mb : 1800
20
+ root_size_mb :
21
+ mpp-format-int : $rootfs_size_mb
21
22
boot_verity_size_mb : 128
22
23
root_verity_size_mb : 256
23
24
sector_size : 512
Original file line number Diff line number Diff line change @@ -55,6 +55,7 @@ platform=$(getconfig "image-type")
55
55
deploy_via_container=$( getconfig_def " deploy-via-container" " " )
56
56
metal_image_size_mb=$( getconfig " metal-image-size" )
57
57
cloud_image_size_mb=$( getconfig " cloud-image-size" )
58
+ rootfs_size_mb=$( getconfig " rootfs-size" )
58
59
container_imgref=$( getconfig " container-imgref" )
59
60
container_repo=$( getconfig_def " container-repo" " " )
60
61
container_tag=$( getconfig_def " container-tag" " " )
@@ -100,6 +101,7 @@ osbuild-mpp \
100
101
-D extra_kargs=\" " ${extra_kargs} " \" \
101
102
-D metal_image_size_mb=" ${metal_image_size_mb} " \
102
103
-D cloud_image_size_mb=" ${cloud_image_size_mb} " \
104
+ -D rootfs_size_mb=" ${rootfs_size_mb} " \
103
105
-D qemu_secex=\" " ${secex} " \" \
104
106
" ${mppyaml} " " ${processed_json} "
105
107
You can’t perform that action at this time.
0 commit comments