live: Move squashfs-compression def into image-default.yaml

This YAML file should have the list of all values parsed by code.
cgwalters · Apr 13, 2022 · 3102e15 · 3102e15
1 parent b647834
commit 3102e15
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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