From 3102e153f1686c468032a7d53f779d2e31ffaf95 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sat, 9 Apr 2022 15:26:54 -0400 Subject: [PATCH] live: Move `squashfs-compression` def into `image-default.yaml` This YAML file should have the list of all values parsed by code. --- src/cmd-buildextend-live | 2 +- src/image-default.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/cmd-buildextend-live b/src/cmd-buildextend-live index 65899f441f..486fd26545 100755 --- a/src/cmd-buildextend-live +++ b/src/cmd-buildextend-live @@ -47,7 +47,7 @@ if not args.build: print(f"Targeting build: {args.build}") image_json = generate_image_json('src/config/image.yaml') -squashfs_compression = 'lz4' if args.fast else image_json.get('squashfs-compression', 'zstd') +squashfs_compression = 'lz4' if args.fast else image_json['squashfs-compression'] srcdir_prefix = "src/config/live/" diff --git a/src/image-default.yaml b/src/image-default.yaml index 57b0578435..2810c34b05 100644 --- a/src/image-default.yaml +++ b/src/image-default.yaml @@ -17,6 +17,9 @@ deploy-via-container: false # Set this to a target container reference, e.g. ostree-unverified-registry:quay.io/example/os:latest # container-imgref: "" +# Format used when generating a squashfs image. Can also be e.g. gzip or lz4 +squashfs-compression: zstd + # Defaults for VMware OVA, matching historical behavior vmware-hw-version: 13 vmware-os-type: rhel7_64Guest