From f22284888cf0fd427f7de95b6e7be541e6be1815 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Sep 05 2024 19:50:19 +0000 Subject: lorax: drop unnecessary options there's no need to pass --noupgrade or --squashfs-only any more. --noupgrade has done nothing since we gave up on fedup in 2015 (lorax still accepts it for backwards compatibility, but ignores it). --squashfs-only is effectively the default since 41.2 - see https://github.com/weldr/lorax/commit/01dd27a . Signed-off-by: Adam Williamson --- diff --git a/fedora.conf b/fedora.conf index 5d4f56e..cb263b6 100644 --- a/fedora.conf +++ b/fedora.conf @@ -81,19 +81,14 @@ buildinstall_skip = [ }), ] -# Enables macboot on x86_64 for all variants and disables upgrade image building -# everywhere. -# Use 3GB image size for all arches. +# Enables macboot on x86_64 for all variants, use 3GB image size for all arches lorax_options = [ ('^.*$', { 'x86_64': { - 'nomacboot': False, - 'squashfs_only': True + 'nomacboot': False }, '*': { - 'noupgrade': True, - 'rootfs_size': 3, - 'squashfs_only': True + 'rootfs_size': 3 } }) ]