diff --git a/internal/manifest/os.go b/internal/manifest/os.go index 6ddf7ad83..0fd749156 100644 --- a/internal/manifest/os.go +++ b/internal/manifest/os.go @@ -388,26 +388,6 @@ func (p *OS) serialize() osbuild.Pipeline { } } - enabledServices := []string{} - disabledServices := []string{} - enabledServices = append(enabledServices, p.EnabledServices...) - disabledServices = append(disabledServices, p.DisabledServices...) - if p.Environment != nil { - enabledServices = append(enabledServices, p.Environment.GetServices()...) - } - if p.Workload != nil { - enabledServices = append(enabledServices, p.Workload.GetServices()...) - disabledServices = append(disabledServices, p.Workload.GetDisabledServices()...) - } - if len(enabledServices) != 0 || - len(disabledServices) != 0 || p.DefaultTarget != "" { - pipeline.AddStage(osbuild.NewSystemdStage(&osbuild.SystemdStageOptions{ - EnabledServices: enabledServices, - DisabledServices: disabledServices, - DefaultTarget: p.DefaultTarget, - })) - } - if p.Firewall != nil { pipeline.AddStage(osbuild.NewFirewallStage(p.Firewall)) } @@ -624,6 +604,26 @@ func (p *OS) serialize() osbuild.Pipeline { })) } + enabledServices := []string{} + disabledServices := []string{} + enabledServices = append(enabledServices, p.EnabledServices...) + disabledServices = append(disabledServices, p.DisabledServices...) + if p.Environment != nil { + enabledServices = append(enabledServices, p.Environment.GetServices()...) + } + if p.Workload != nil { + enabledServices = append(enabledServices, p.Workload.GetServices()...) + disabledServices = append(disabledServices, p.Workload.GetDisabledServices()...) + } + if len(enabledServices) != 0 || + len(disabledServices) != 0 || p.DefaultTarget != "" { + pipeline.AddStage(osbuild.NewSystemdStage(&osbuild.SystemdStageOptions{ + EnabledServices: enabledServices, + DisabledServices: disabledServices, + DefaultTarget: p.DefaultTarget, + })) + } + if p.SElinux != "" { pipeline.AddStage(osbuild.NewSELinuxStage(&osbuild.SELinuxStageOptions{ FileContexts: fmt.Sprintf("etc/selinux/%s/contexts/files/file_contexts", p.SElinux), diff --git a/test/data/manifests/centos_8-aarch64-ami-boot.json b/test/data/manifests/centos_8-aarch64-ami-boot.json index 74cf2d2f6..3b29c3dea 100644 --- a/test/data/manifests/centos_8-aarch64-ami-boot.json +++ b/test/data/manifests/centos_8-aarch64-ami-boot.json @@ -4720,23 +4720,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4889,6 +4872,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_8-aarch64-edge_commit-boot.json b/test/data/manifests/centos_8-aarch64-edge_commit-boot.json index d2f9e243d..61348cb0b 100644 --- a/test/data/manifests/centos_8-aarch64-edge_commit-boot.json +++ b/test/data/manifests/centos_8-aarch64-edge_commit-boot.json @@ -4647,17 +4647,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4682,6 +4671,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_8-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/centos_8-aarch64-edge_commit_with_container-boot.json index dfd639b1e..bd30a1485 100644 --- a/test/data/manifests/centos_8-aarch64-edge_commit_with_container-boot.json +++ b/test/data/manifests/centos_8-aarch64-edge_commit_with_container-boot.json @@ -4912,17 +4912,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4947,6 +4936,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_8-aarch64-edge_container-boot.json b/test/data/manifests/centos_8-aarch64-edge_container-boot.json index 0cbe5bbed..1c66f7e7b 100644 --- a/test/data/manifests/centos_8-aarch64-edge_container-boot.json +++ b/test/data/manifests/centos_8-aarch64-edge_container-boot.json @@ -4647,17 +4647,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4682,6 +4671,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_8-aarch64-qcow2-boot.json b/test/data/manifests/centos_8-aarch64-qcow2-boot.json index 5054c908c..d11b957cb 100644 --- a/test/data/manifests/centos_8-aarch64-qcow2-boot.json +++ b/test/data/manifests/centos_8-aarch64-qcow2-boot.json @@ -4913,12 +4913,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4966,6 +4960,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_8-aarch64-qcow2_customize-boot.json b/test/data/manifests/centos_8-aarch64-qcow2_customize-boot.json index ed7ab8a11..d468152b8 100644 --- a/test/data/manifests/centos_8-aarch64-qcow2_customize-boot.json +++ b/test/data/manifests/centos_8-aarch64-qcow2_customize-boot.json @@ -5400,18 +5400,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5472,6 +5460,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_8-aarch64-vhd-boot.json b/test/data/manifests/centos_8-aarch64-vhd-boot.json index 5463eeb8a..52ccf3918 100644 --- a/test/data/manifests/centos_8-aarch64-vhd-boot.json +++ b/test/data/manifests/centos_8-aarch64-vhd-boot.json @@ -6308,20 +6308,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "systemd-resolved", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -6557,6 +6543,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "systemd-resolved", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_8-ppc64le-qcow2-boot.json b/test/data/manifests/centos_8-ppc64le-qcow2-boot.json index e1a6f69ac..93f4f484a 100644 --- a/test/data/manifests/centos_8-ppc64le-qcow2-boot.json +++ b/test/data/manifests/centos_8-ppc64le-qcow2-boot.json @@ -5313,12 +5313,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5357,6 +5351,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_8-ppc64le-qcow2_customize-boot.json b/test/data/manifests/centos_8-ppc64le-qcow2_customize-boot.json index b6805dc71..7ab2a69dc 100644 --- a/test/data/manifests/centos_8-ppc64le-qcow2_customize-boot.json +++ b/test/data/manifests/centos_8-ppc64le-qcow2_customize-boot.json @@ -5800,18 +5800,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5863,6 +5851,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_8-x86_64-ami-boot.json b/test/data/manifests/centos_8-x86_64-ami-boot.json index 7dc3732c7..0d190f3e8 100644 --- a/test/data/manifests/centos_8-x86_64-ami-boot.json +++ b/test/data/manifests/centos_8-x86_64-ami-boot.json @@ -4494,23 +4494,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4659,6 +4642,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_8-x86_64-edge_commit-boot.json b/test/data/manifests/centos_8-x86_64-edge_commit-boot.json index 790f9e8d5..4cd6acea2 100644 --- a/test/data/manifests/centos_8-x86_64-edge_commit-boot.json +++ b/test/data/manifests/centos_8-x86_64-edge_commit-boot.json @@ -4807,17 +4807,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4842,6 +4831,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_8-x86_64-edge_commit_rt-boot.json b/test/data/manifests/centos_8-x86_64-edge_commit_rt-boot.json index 79a53770a..450dba2de 100644 --- a/test/data/manifests/centos_8-x86_64-edge_commit_rt-boot.json +++ b/test/data/manifests/centos_8-x86_64-edge_commit_rt-boot.json @@ -4798,17 +4798,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4833,6 +4822,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_8-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/centos_8-x86_64-edge_commit_with_container-boot.json index c03534bcf..056befaf7 100644 --- a/test/data/manifests/centos_8-x86_64-edge_commit_with_container-boot.json +++ b/test/data/manifests/centos_8-x86_64-edge_commit_with_container-boot.json @@ -5072,17 +5072,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5107,6 +5096,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_8-x86_64-edge_container-boot.json b/test/data/manifests/centos_8-x86_64-edge_container-boot.json index 149b96f7c..d7cc010f3 100644 --- a/test/data/manifests/centos_8-x86_64-edge_container-boot.json +++ b/test/data/manifests/centos_8-x86_64-edge_container-boot.json @@ -4807,17 +4807,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4842,6 +4831,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_8-x86_64-gce-boot.json b/test/data/manifests/centos_8-x86_64-gce-boot.json index 26b003d98..389cb01ab 100644 --- a/test/data/manifests/centos_8-x86_64-gce-boot.json +++ b/test/data/manifests/centos_8-x86_64-gce-boot.json @@ -4883,21 +4883,6 @@ ] } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "rngd", - "dnf-automatic.timer" - ], - "disabled_services": [ - "sshd-keygen@", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.firewall", "options": { @@ -5024,6 +5009,21 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "rngd", + "dnf-automatic.timer" + ], + "disabled_services": [ + "sshd-keygen@", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_8-x86_64-oci-boot.json b/test/data/manifests/centos_8-x86_64-oci-boot.json index b495cff9b..74b83e59e 100644 --- a/test/data/manifests/centos_8-x86_64-oci-boot.json +++ b/test/data/manifests/centos_8-x86_64-oci-boot.json @@ -4956,12 +4956,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5010,6 +5004,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_8-x86_64-qcow2-boot.json b/test/data/manifests/centos_8-x86_64-qcow2-boot.json index 92530d072..71ca6ee3b 100644 --- a/test/data/manifests/centos_8-x86_64-qcow2-boot.json +++ b/test/data/manifests/centos_8-x86_64-qcow2-boot.json @@ -4977,12 +4977,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5031,6 +5025,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_8-x86_64-qcow2_customize-boot.json b/test/data/manifests/centos_8-x86_64-qcow2_customize-boot.json index 459353ea6..e3d2a3eb5 100644 --- a/test/data/manifests/centos_8-x86_64-qcow2_customize-boot.json +++ b/test/data/manifests/centos_8-x86_64-qcow2_customize-boot.json @@ -5472,18 +5472,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5545,6 +5533,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_8-x86_64-vhd-boot.json b/test/data/manifests/centos_8-x86_64-vhd-boot.json index 796324403..8c531e5d4 100644 --- a/test/data/manifests/centos_8-x86_64-vhd-boot.json +++ b/test/data/manifests/centos_8-x86_64-vhd-boot.json @@ -6436,20 +6436,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "systemd-resolved", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -6686,6 +6672,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "systemd-resolved", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_9-aarch64-ami-boot.json b/test/data/manifests/centos_9-aarch64-ami-boot.json index 0cc2c5b8d..61511dd2b 100644 --- a/test/data/manifests/centos_9-aarch64-ami-boot.json +++ b/test/data/manifests/centos_9-aarch64-ami-boot.json @@ -4279,24 +4279,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target", - "tuned" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4450,6 +4432,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target", + "tuned" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_9-aarch64-edge_commit-boot.json b/test/data/manifests/centos_9-aarch64-edge_commit-boot.json index 16e237c4d..360b71f5f 100644 --- a/test/data/manifests/centos_9-aarch64-edge_commit-boot.json +++ b/test/data/manifests/centos_9-aarch64-edge_commit-boot.json @@ -4503,19 +4503,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service", - "ignition-firstboot-complete.service", - "coreos-ignition-write-issues.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4540,6 +4527,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service", + "ignition-firstboot-complete.service", + "coreos-ignition-write-issues.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_9-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/centos_9-aarch64-edge_commit_with_container-boot.json index 7a8189478..75ed7d5de 100644 --- a/test/data/manifests/centos_9-aarch64-edge_commit_with_container-boot.json +++ b/test/data/manifests/centos_9-aarch64-edge_commit_with_container-boot.json @@ -4552,19 +4552,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service", - "ignition-firstboot-complete.service", - "coreos-ignition-write-issues.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4589,6 +4576,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service", + "ignition-firstboot-complete.service", + "coreos-ignition-write-issues.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_9-aarch64-edge_container-boot.json b/test/data/manifests/centos_9-aarch64-edge_container-boot.json index 1de11150a..052f3b69b 100644 --- a/test/data/manifests/centos_9-aarch64-edge_container-boot.json +++ b/test/data/manifests/centos_9-aarch64-edge_container-boot.json @@ -4503,19 +4503,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service", - "ignition-firstboot-complete.service", - "coreos-ignition-write-issues.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4540,6 +4527,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service", + "ignition-firstboot-complete.service", + "coreos-ignition-write-issues.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_9-aarch64-qcow2-boot.json b/test/data/manifests/centos_9-aarch64-qcow2-boot.json index a050b2924..659f3969d 100644 --- a/test/data/manifests/centos_9-aarch64-qcow2-boot.json +++ b/test/data/manifests/centos_9-aarch64-qcow2-boot.json @@ -4466,12 +4466,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4527,6 +4521,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_9-aarch64-qcow2_customize-boot.json b/test/data/manifests/centos_9-aarch64-qcow2_customize-boot.json index 81d51cf23..bf0cb1d31 100644 --- a/test/data/manifests/centos_9-aarch64-qcow2_customize-boot.json +++ b/test/data/manifests/centos_9-aarch64-qcow2_customize-boot.json @@ -4783,18 +4783,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4856,6 +4844,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_9-aarch64-vhd-boot.json b/test/data/manifests/centos_9-aarch64-vhd-boot.json index 89067e554..d013221a1 100644 --- a/test/data/manifests/centos_9-aarch64-vhd-boot.json +++ b/test/data/manifests/centos_9-aarch64-vhd-boot.json @@ -5861,19 +5861,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -6093,6 +6080,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_9-ppc64le-qcow2-boot.json b/test/data/manifests/centos_9-ppc64le-qcow2-boot.json index 65025b5cf..02caf9723 100644 --- a/test/data/manifests/centos_9-ppc64le-qcow2-boot.json +++ b/test/data/manifests/centos_9-ppc64le-qcow2-boot.json @@ -5114,12 +5114,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5165,6 +5159,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_9-ppc64le-qcow2_customize-boot.json b/test/data/manifests/centos_9-ppc64le-qcow2_customize-boot.json index 43090632c..77523a383 100644 --- a/test/data/manifests/centos_9-ppc64le-qcow2_customize-boot.json +++ b/test/data/manifests/centos_9-ppc64le-qcow2_customize-boot.json @@ -5415,18 +5415,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5478,6 +5466,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_9-s390x-qcow2-boot.json b/test/data/manifests/centos_9-s390x-qcow2-boot.json index 3c70ac59f..017035d2d 100644 --- a/test/data/manifests/centos_9-s390x-qcow2-boot.json +++ b/test/data/manifests/centos_9-s390x-qcow2-boot.json @@ -5347,12 +5347,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5389,6 +5383,12 @@ "type": "org.osbuild.zipl", "options": {} }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_9-s390x-qcow2_customize-boot.json b/test/data/manifests/centos_9-s390x-qcow2_customize-boot.json index 896f12451..06b8f9d6a 100644 --- a/test/data/manifests/centos_9-s390x-qcow2_customize-boot.json +++ b/test/data/manifests/centos_9-s390x-qcow2_customize-boot.json @@ -5656,18 +5656,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5710,6 +5698,18 @@ "type": "org.osbuild.zipl", "options": {} }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_9-x86_64-ami-boot.json b/test/data/manifests/centos_9-x86_64-ami-boot.json index e8508008c..c8bc730c2 100644 --- a/test/data/manifests/centos_9-x86_64-ami-boot.json +++ b/test/data/manifests/centos_9-x86_64-ami-boot.json @@ -4247,24 +4247,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target", - "tuned" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4427,6 +4409,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target", + "tuned" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_9-x86_64-edge_commit-boot.json b/test/data/manifests/centos_9-x86_64-edge_commit-boot.json index ac9f7871b..8a01a3ac8 100644 --- a/test/data/manifests/centos_9-x86_64-edge_commit-boot.json +++ b/test/data/manifests/centos_9-x86_64-edge_commit-boot.json @@ -4711,19 +4711,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service", - "ignition-firstboot-complete.service", - "coreos-ignition-write-issues.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4748,6 +4735,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service", + "ignition-firstboot-complete.service", + "coreos-ignition-write-issues.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_9-x86_64-edge_commit_rt-boot.json b/test/data/manifests/centos_9-x86_64-edge_commit_rt-boot.json index 7ac302584..a4d3072e1 100644 --- a/test/data/manifests/centos_9-x86_64-edge_commit_rt-boot.json +++ b/test/data/manifests/centos_9-x86_64-edge_commit_rt-boot.json @@ -4878,19 +4878,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service", - "ignition-firstboot-complete.service", - "coreos-ignition-write-issues.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4915,6 +4902,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service", + "ignition-firstboot-complete.service", + "coreos-ignition-write-issues.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_9-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/centos_9-x86_64-edge_commit_with_container-boot.json index ff4db7d6f..ca818de26 100644 --- a/test/data/manifests/centos_9-x86_64-edge_commit_with_container-boot.json +++ b/test/data/manifests/centos_9-x86_64-edge_commit_with_container-boot.json @@ -4760,19 +4760,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service", - "ignition-firstboot-complete.service", - "coreos-ignition-write-issues.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4797,6 +4784,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service", + "ignition-firstboot-complete.service", + "coreos-ignition-write-issues.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_9-x86_64-edge_container-boot.json b/test/data/manifests/centos_9-x86_64-edge_container-boot.json index 60aeb0617..dfd9d397a 100644 --- a/test/data/manifests/centos_9-x86_64-edge_container-boot.json +++ b/test/data/manifests/centos_9-x86_64-edge_container-boot.json @@ -4711,19 +4711,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service", - "ignition-firstboot-complete.service", - "coreos-ignition-write-issues.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4748,6 +4735,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service", + "ignition-firstboot-complete.service", + "coreos-ignition-write-issues.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_9-x86_64-gce-boot.json b/test/data/manifests/centos_9-x86_64-gce-boot.json index f002f15e5..c01cde2a2 100644 --- a/test/data/manifests/centos_9-x86_64-gce-boot.json +++ b/test/data/manifests/centos_9-x86_64-gce-boot.json @@ -4515,21 +4515,6 @@ ] } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "rngd", - "dnf-automatic.timer" - ], - "disabled_services": [ - "sshd-keygen@", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.firewall", "options": { @@ -4664,6 +4649,21 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "rngd", + "dnf-automatic.timer" + ], + "disabled_services": [ + "sshd-keygen@", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_9-x86_64-oci-boot.json b/test/data/manifests/centos_9-x86_64-oci-boot.json index e8520c098..a2dccfa3f 100644 --- a/test/data/manifests/centos_9-x86_64-oci-boot.json +++ b/test/data/manifests/centos_9-x86_64-oci-boot.json @@ -4733,12 +4733,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4795,6 +4789,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_9-x86_64-qcow2-boot.json b/test/data/manifests/centos_9-x86_64-qcow2-boot.json index d6afd29c4..ca8d50aa3 100644 --- a/test/data/manifests/centos_9-x86_64-qcow2-boot.json +++ b/test/data/manifests/centos_9-x86_64-qcow2-boot.json @@ -4754,12 +4754,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4816,6 +4810,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_9-x86_64-qcow2_customize-boot.json b/test/data/manifests/centos_9-x86_64-qcow2_customize-boot.json index b37145c32..69b82c5fc 100644 --- a/test/data/manifests/centos_9-x86_64-qcow2_customize-boot.json +++ b/test/data/manifests/centos_9-x86_64-qcow2_customize-boot.json @@ -5151,18 +5151,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5225,6 +5213,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/centos_9-x86_64-vhd-boot.json b/test/data/manifests/centos_9-x86_64-vhd-boot.json index db9f28979..8d17a264a 100644 --- a/test/data/manifests/centos_9-x86_64-vhd-boot.json +++ b/test/data/manifests/centos_9-x86_64-vhd-boot.json @@ -6189,19 +6189,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -6422,6 +6409,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_36-aarch64-ami-boot.json b/test/data/manifests/fedora_36-aarch64-ami-boot.json index 2bbcc0592..ffdd97314 100644 --- a/test/data/manifests/fedora_36-aarch64-ami-boot.json +++ b/test/data/manifests/fedora_36-aarch64-ami-boot.json @@ -4829,15 +4829,6 @@ "zone": "UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.fstab", "options": { @@ -4880,6 +4871,15 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_36-aarch64-iot_commit-boot.json b/test/data/manifests/fedora_36-aarch64-iot_commit-boot.json index 877b2f963..fece82f3f 100644 --- a/test/data/manifests/fedora_36-aarch64-iot_commit-boot.json +++ b/test/data/manifests/fedora_36-aarch64-iot_commit-boot.json @@ -5375,6 +5375,17 @@ "zone": "UTC" } }, + { + "type": "org.osbuild.systemd-journald", + "options": { + "filename": "10-persistent.conf", + "config": { + "Journal": { + "Storage": "persistent" + } + } + } + }, { "type": "org.osbuild.systemd", "options": { @@ -5398,17 +5409,6 @@ ] } }, - { - "type": "org.osbuild.systemd-journald", - "options": { - "filename": "10-persistent.conf", - "config": { - "Journal": { - "Storage": "persistent" - } - } - } - }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_36-aarch64-iot_commit_with_container-boot.json b/test/data/manifests/fedora_36-aarch64-iot_commit_with_container-boot.json index 35b08a4b5..2dbe0953b 100644 --- a/test/data/manifests/fedora_36-aarch64-iot_commit_with_container-boot.json +++ b/test/data/manifests/fedora_36-aarch64-iot_commit_with_container-boot.json @@ -5424,6 +5424,17 @@ "zone": "UTC" } }, + { + "type": "org.osbuild.systemd-journald", + "options": { + "filename": "10-persistent.conf", + "config": { + "Journal": { + "Storage": "persistent" + } + } + } + }, { "type": "org.osbuild.systemd", "options": { @@ -5447,17 +5458,6 @@ ] } }, - { - "type": "org.osbuild.systemd-journald", - "options": { - "filename": "10-persistent.conf", - "config": { - "Journal": { - "Storage": "persistent" - } - } - } - }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_36-aarch64-iot_container-boot.json b/test/data/manifests/fedora_36-aarch64-iot_container-boot.json index 92f9ed9c5..53bcbce55 100644 --- a/test/data/manifests/fedora_36-aarch64-iot_container-boot.json +++ b/test/data/manifests/fedora_36-aarch64-iot_container-boot.json @@ -5375,6 +5375,17 @@ "zone": "UTC" } }, + { + "type": "org.osbuild.systemd-journald", + "options": { + "filename": "10-persistent.conf", + "config": { + "Journal": { + "Storage": "persistent" + } + } + } + }, { "type": "org.osbuild.systemd", "options": { @@ -5398,17 +5409,6 @@ ] } }, - { - "type": "org.osbuild.systemd-journald", - "options": { - "filename": "10-persistent.conf", - "config": { - "Journal": { - "Storage": "persistent" - } - } - } - }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_36-aarch64-oci-boot.json b/test/data/manifests/fedora_36-aarch64-oci-boot.json index 8938266ad..b6b804525 100644 --- a/test/data/manifests/fedora_36-aarch64-oci-boot.json +++ b/test/data/manifests/fedora_36-aarch64-oci-boot.json @@ -4813,18 +4813,6 @@ "zone": "UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service", - "cloud-config.service", - "cloud-final.service", - "cloud-init-local.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.fstab", "options": { @@ -4867,6 +4855,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service", + "cloud-config.service", + "cloud-final.service", + "cloud-init-local.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_36-aarch64-openstack-boot.json b/test/data/manifests/fedora_36-aarch64-openstack-boot.json index c4d682e0b..6c9597bb5 100644 --- a/test/data/manifests/fedora_36-aarch64-openstack-boot.json +++ b/test/data/manifests/fedora_36-aarch64-openstack-boot.json @@ -5058,17 +5058,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service", - "cloud-config.service", - "cloud-final.service", - "cloud-init-local.service" - ] - } - }, { "type": "org.osbuild.fstab", "options": { @@ -5111,6 +5100,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service", + "cloud-config.service", + "cloud-final.service", + "cloud-init-local.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_36-aarch64-qcow2-boot.json b/test/data/manifests/fedora_36-aarch64-qcow2-boot.json index 1cff618ea..111a46c1a 100644 --- a/test/data/manifests/fedora_36-aarch64-qcow2-boot.json +++ b/test/data/manifests/fedora_36-aarch64-qcow2-boot.json @@ -4834,18 +4834,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service", - "cloud-config.service", - "cloud-final.service", - "cloud-init-local.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.fstab", "options": { @@ -4888,6 +4876,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service", + "cloud-config.service", + "cloud-final.service", + "cloud-init-local.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_36-aarch64-qcow2_customize-boot.json b/test/data/manifests/fedora_36-aarch64-qcow2_customize-boot.json index ffe6f8b9a..7f6eb9bb8 100644 --- a/test/data/manifests/fedora_36-aarch64-qcow2_customize-boot.json +++ b/test/data/manifests/fedora_36-aarch64-qcow2_customize-boot.json @@ -5257,22 +5257,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service", - "cloud-config.service", - "cloud-final.service", - "cloud-init-local.service", - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.fstab", "options": { @@ -5321,6 +5305,22 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service", + "cloud-config.service", + "cloud-final.service", + "cloud-init-local.service", + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_36-x86_64-ami-boot.json b/test/data/manifests/fedora_36-x86_64-ami-boot.json index b65b00853..ee747c8b6 100644 --- a/test/data/manifests/fedora_36-x86_64-ami-boot.json +++ b/test/data/manifests/fedora_36-x86_64-ami-boot.json @@ -4869,15 +4869,6 @@ "zone": "UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.fstab", "options": { @@ -4917,6 +4908,15 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_36-x86_64-iot_commit-boot.json b/test/data/manifests/fedora_36-x86_64-iot_commit-boot.json index 6467b3c51..0136b4eab 100644 --- a/test/data/manifests/fedora_36-x86_64-iot_commit-boot.json +++ b/test/data/manifests/fedora_36-x86_64-iot_commit-boot.json @@ -5495,6 +5495,17 @@ "zone": "UTC" } }, + { + "type": "org.osbuild.systemd-journald", + "options": { + "filename": "10-persistent.conf", + "config": { + "Journal": { + "Storage": "persistent" + } + } + } + }, { "type": "org.osbuild.systemd", "options": { @@ -5518,17 +5529,6 @@ ] } }, - { - "type": "org.osbuild.systemd-journald", - "options": { - "filename": "10-persistent.conf", - "config": { - "Journal": { - "Storage": "persistent" - } - } - } - }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_36-x86_64-iot_commit_debug-boot.json b/test/data/manifests/fedora_36-x86_64-iot_commit_debug-boot.json index 874432e07..4d3f6370e 100644 --- a/test/data/manifests/fedora_36-x86_64-iot_commit_debug-boot.json +++ b/test/data/manifests/fedora_36-x86_64-iot_commit_debug-boot.json @@ -5502,6 +5502,17 @@ "zone": "UTC" } }, + { + "type": "org.osbuild.systemd-journald", + "options": { + "filename": "10-persistent.conf", + "config": { + "Journal": { + "Storage": "persistent" + } + } + } + }, { "type": "org.osbuild.systemd", "options": { @@ -5525,17 +5536,6 @@ ] } }, - { - "type": "org.osbuild.systemd-journald", - "options": { - "filename": "10-persistent.conf", - "config": { - "Journal": { - "Storage": "persistent" - } - } - } - }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_36-x86_64-iot_commit_with_container-boot.json b/test/data/manifests/fedora_36-x86_64-iot_commit_with_container-boot.json index bdb160b28..7dde292e6 100644 --- a/test/data/manifests/fedora_36-x86_64-iot_commit_with_container-boot.json +++ b/test/data/manifests/fedora_36-x86_64-iot_commit_with_container-boot.json @@ -5544,6 +5544,17 @@ "zone": "UTC" } }, + { + "type": "org.osbuild.systemd-journald", + "options": { + "filename": "10-persistent.conf", + "config": { + "Journal": { + "Storage": "persistent" + } + } + } + }, { "type": "org.osbuild.systemd", "options": { @@ -5567,17 +5578,6 @@ ] } }, - { - "type": "org.osbuild.systemd-journald", - "options": { - "filename": "10-persistent.conf", - "config": { - "Journal": { - "Storage": "persistent" - } - } - } - }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_36-x86_64-iot_container-boot.json b/test/data/manifests/fedora_36-x86_64-iot_container-boot.json index 1b0ccb71a..20384dbd9 100644 --- a/test/data/manifests/fedora_36-x86_64-iot_container-boot.json +++ b/test/data/manifests/fedora_36-x86_64-iot_container-boot.json @@ -5495,6 +5495,17 @@ "zone": "UTC" } }, + { + "type": "org.osbuild.systemd-journald", + "options": { + "filename": "10-persistent.conf", + "config": { + "Journal": { + "Storage": "persistent" + } + } + } + }, { "type": "org.osbuild.systemd", "options": { @@ -5518,17 +5529,6 @@ ] } }, - { - "type": "org.osbuild.systemd-journald", - "options": { - "filename": "10-persistent.conf", - "config": { - "Journal": { - "Storage": "persistent" - } - } - } - }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_36-x86_64-oci-boot.json b/test/data/manifests/fedora_36-x86_64-oci-boot.json index b553f026a..46172c123 100644 --- a/test/data/manifests/fedora_36-x86_64-oci-boot.json +++ b/test/data/manifests/fedora_36-x86_64-oci-boot.json @@ -4957,18 +4957,6 @@ "zone": "UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service", - "cloud-config.service", - "cloud-final.service", - "cloud-init-local.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.fstab", "options": { @@ -5012,6 +5000,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service", + "cloud-config.service", + "cloud-final.service", + "cloud-init-local.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_36-x86_64-openstack-boot.json b/test/data/manifests/fedora_36-x86_64-openstack-boot.json index aeebca1e9..0b5930cec 100644 --- a/test/data/manifests/fedora_36-x86_64-openstack-boot.json +++ b/test/data/manifests/fedora_36-x86_64-openstack-boot.json @@ -5138,17 +5138,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service", - "cloud-config.service", - "cloud-final.service", - "cloud-init-local.service" - ] - } - }, { "type": "org.osbuild.fstab", "options": { @@ -5192,6 +5181,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service", + "cloud-config.service", + "cloud-final.service", + "cloud-init-local.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_36-x86_64-qcow2-boot.json b/test/data/manifests/fedora_36-x86_64-qcow2-boot.json index 50d3a68da..ee610098e 100644 --- a/test/data/manifests/fedora_36-x86_64-qcow2-boot.json +++ b/test/data/manifests/fedora_36-x86_64-qcow2-boot.json @@ -4978,18 +4978,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service", - "cloud-config.service", - "cloud-final.service", - "cloud-init-local.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.fstab", "options": { @@ -5033,6 +5021,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service", + "cloud-config.service", + "cloud-final.service", + "cloud-init-local.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_36-x86_64-qcow2_customize-boot.json b/test/data/manifests/fedora_36-x86_64-qcow2_customize-boot.json index 731d7c43f..172873298 100644 --- a/test/data/manifests/fedora_36-x86_64-qcow2_customize-boot.json +++ b/test/data/manifests/fedora_36-x86_64-qcow2_customize-boot.json @@ -5401,22 +5401,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service", - "cloud-config.service", - "cloud-final.service", - "cloud-init-local.service", - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.fstab", "options": { @@ -5466,6 +5450,22 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service", + "cloud-config.service", + "cloud-final.service", + "cloud-init-local.service", + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_36-x86_64-vhd-boot.json b/test/data/manifests/fedora_36-x86_64-vhd-boot.json index c69fc86a5..d412d4ccd 100644 --- a/test/data/manifests/fedora_36-x86_64-vhd-boot.json +++ b/test/data/manifests/fedora_36-x86_64-vhd-boot.json @@ -4778,20 +4778,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "waagent" - ], - "disabled_services": [ - "proc-sys-fs-binfmt_misc.mount", - "loadmodules.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.fstab", "options": { @@ -4835,6 +4821,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "waagent" + ], + "disabled_services": [ + "proc-sys-fs-binfmt_misc.mount", + "loadmodules.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_36-x86_64-vmdk-boot.json b/test/data/manifests/fedora_36-x86_64-vmdk-boot.json index 42e17839d..b8eff3dfe 100644 --- a/test/data/manifests/fedora_36-x86_64-vmdk-boot.json +++ b/test/data/manifests/fedora_36-x86_64-vmdk-boot.json @@ -4978,17 +4978,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service", - "cloud-config.service", - "cloud-final.service", - "cloud-init-local.service" - ] - } - }, { "type": "org.osbuild.fstab", "options": { @@ -5032,6 +5021,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service", + "cloud-config.service", + "cloud-final.service", + "cloud-init-local.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_37-aarch64-ami-boot.json b/test/data/manifests/fedora_37-aarch64-ami-boot.json index 45495236d..d92cff420 100644 --- a/test/data/manifests/fedora_37-aarch64-ami-boot.json +++ b/test/data/manifests/fedora_37-aarch64-ami-boot.json @@ -4819,15 +4819,6 @@ "zone": "UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.fstab", "options": { @@ -4870,6 +4861,15 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_37-aarch64-iot_commit-boot.json b/test/data/manifests/fedora_37-aarch64-iot_commit-boot.json index 51a7fa9e8..5a0bcbfe3 100644 --- a/test/data/manifests/fedora_37-aarch64-iot_commit-boot.json +++ b/test/data/manifests/fedora_37-aarch64-iot_commit-boot.json @@ -5445,6 +5445,17 @@ "zone": "UTC" } }, + { + "type": "org.osbuild.systemd-journald", + "options": { + "filename": "10-persistent.conf", + "config": { + "Journal": { + "Storage": "persistent" + } + } + } + }, { "type": "org.osbuild.systemd", "options": { @@ -5468,17 +5479,6 @@ ] } }, - { - "type": "org.osbuild.systemd-journald", - "options": { - "filename": "10-persistent.conf", - "config": { - "Journal": { - "Storage": "persistent" - } - } - } - }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_37-aarch64-iot_commit_with_container-boot.json b/test/data/manifests/fedora_37-aarch64-iot_commit_with_container-boot.json index 9202b28f5..5d4c0c11a 100644 --- a/test/data/manifests/fedora_37-aarch64-iot_commit_with_container-boot.json +++ b/test/data/manifests/fedora_37-aarch64-iot_commit_with_container-boot.json @@ -5494,6 +5494,17 @@ "zone": "UTC" } }, + { + "type": "org.osbuild.systemd-journald", + "options": { + "filename": "10-persistent.conf", + "config": { + "Journal": { + "Storage": "persistent" + } + } + } + }, { "type": "org.osbuild.systemd", "options": { @@ -5517,17 +5528,6 @@ ] } }, - { - "type": "org.osbuild.systemd-journald", - "options": { - "filename": "10-persistent.conf", - "config": { - "Journal": { - "Storage": "persistent" - } - } - } - }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_37-aarch64-iot_container-boot.json b/test/data/manifests/fedora_37-aarch64-iot_container-boot.json index 187d6f99b..661bfdfe2 100644 --- a/test/data/manifests/fedora_37-aarch64-iot_container-boot.json +++ b/test/data/manifests/fedora_37-aarch64-iot_container-boot.json @@ -5445,6 +5445,17 @@ "zone": "UTC" } }, + { + "type": "org.osbuild.systemd-journald", + "options": { + "filename": "10-persistent.conf", + "config": { + "Journal": { + "Storage": "persistent" + } + } + } + }, { "type": "org.osbuild.systemd", "options": { @@ -5468,17 +5479,6 @@ ] } }, - { - "type": "org.osbuild.systemd-journald", - "options": { - "filename": "10-persistent.conf", - "config": { - "Journal": { - "Storage": "persistent" - } - } - } - }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_37-aarch64-oci-boot.json b/test/data/manifests/fedora_37-aarch64-oci-boot.json index f66662c33..e0b34ae7a 100644 --- a/test/data/manifests/fedora_37-aarch64-oci-boot.json +++ b/test/data/manifests/fedora_37-aarch64-oci-boot.json @@ -4811,18 +4811,6 @@ "zone": "UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service", - "cloud-config.service", - "cloud-final.service", - "cloud-init-local.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.fstab", "options": { @@ -4865,6 +4853,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service", + "cloud-config.service", + "cloud-final.service", + "cloud-init-local.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_37-aarch64-openstack-boot.json b/test/data/manifests/fedora_37-aarch64-openstack-boot.json index 3f4d0d338..9edbfdc4e 100644 --- a/test/data/manifests/fedora_37-aarch64-openstack-boot.json +++ b/test/data/manifests/fedora_37-aarch64-openstack-boot.json @@ -5048,17 +5048,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service", - "cloud-config.service", - "cloud-final.service", - "cloud-init-local.service" - ] - } - }, { "type": "org.osbuild.fstab", "options": { @@ -5101,6 +5090,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service", + "cloud-config.service", + "cloud-final.service", + "cloud-init-local.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_37-aarch64-qcow2-boot.json b/test/data/manifests/fedora_37-aarch64-qcow2-boot.json index 3724b54a3..58ffe01aa 100644 --- a/test/data/manifests/fedora_37-aarch64-qcow2-boot.json +++ b/test/data/manifests/fedora_37-aarch64-qcow2-boot.json @@ -4832,18 +4832,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service", - "cloud-config.service", - "cloud-final.service", - "cloud-init-local.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.fstab", "options": { @@ -4886,6 +4874,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service", + "cloud-config.service", + "cloud-final.service", + "cloud-init-local.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_37-aarch64-qcow2_customize-boot.json b/test/data/manifests/fedora_37-aarch64-qcow2_customize-boot.json index c0277cef7..824c01939 100644 --- a/test/data/manifests/fedora_37-aarch64-qcow2_customize-boot.json +++ b/test/data/manifests/fedora_37-aarch64-qcow2_customize-boot.json @@ -5255,22 +5255,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service", - "cloud-config.service", - "cloud-final.service", - "cloud-init-local.service", - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.fstab", "options": { @@ -5319,6 +5303,22 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service", + "cloud-config.service", + "cloud-final.service", + "cloud-init-local.service", + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_37-x86_64-ami-boot.json b/test/data/manifests/fedora_37-x86_64-ami-boot.json index 17322c7cb..7a810e219 100644 --- a/test/data/manifests/fedora_37-x86_64-ami-boot.json +++ b/test/data/manifests/fedora_37-x86_64-ami-boot.json @@ -4859,15 +4859,6 @@ "zone": "UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.fstab", "options": { @@ -4907,6 +4898,15 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_37-x86_64-iot_commit-boot.json b/test/data/manifests/fedora_37-x86_64-iot_commit-boot.json index d28496723..2a0dc90b4 100644 --- a/test/data/manifests/fedora_37-x86_64-iot_commit-boot.json +++ b/test/data/manifests/fedora_37-x86_64-iot_commit-boot.json @@ -5565,6 +5565,17 @@ "zone": "UTC" } }, + { + "type": "org.osbuild.systemd-journald", + "options": { + "filename": "10-persistent.conf", + "config": { + "Journal": { + "Storage": "persistent" + } + } + } + }, { "type": "org.osbuild.systemd", "options": { @@ -5588,17 +5599,6 @@ ] } }, - { - "type": "org.osbuild.systemd-journald", - "options": { - "filename": "10-persistent.conf", - "config": { - "Journal": { - "Storage": "persistent" - } - } - } - }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_37-x86_64-iot_commit_debug-boot.json b/test/data/manifests/fedora_37-x86_64-iot_commit_debug-boot.json index be3f9f909..10b28e07b 100644 --- a/test/data/manifests/fedora_37-x86_64-iot_commit_debug-boot.json +++ b/test/data/manifests/fedora_37-x86_64-iot_commit_debug-boot.json @@ -5572,6 +5572,17 @@ "zone": "UTC" } }, + { + "type": "org.osbuild.systemd-journald", + "options": { + "filename": "10-persistent.conf", + "config": { + "Journal": { + "Storage": "persistent" + } + } + } + }, { "type": "org.osbuild.systemd", "options": { @@ -5595,17 +5606,6 @@ ] } }, - { - "type": "org.osbuild.systemd-journald", - "options": { - "filename": "10-persistent.conf", - "config": { - "Journal": { - "Storage": "persistent" - } - } - } - }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_37-x86_64-iot_commit_with_container-boot.json b/test/data/manifests/fedora_37-x86_64-iot_commit_with_container-boot.json index 2b0fbfc1e..d14c1548d 100644 --- a/test/data/manifests/fedora_37-x86_64-iot_commit_with_container-boot.json +++ b/test/data/manifests/fedora_37-x86_64-iot_commit_with_container-boot.json @@ -5614,6 +5614,17 @@ "zone": "UTC" } }, + { + "type": "org.osbuild.systemd-journald", + "options": { + "filename": "10-persistent.conf", + "config": { + "Journal": { + "Storage": "persistent" + } + } + } + }, { "type": "org.osbuild.systemd", "options": { @@ -5637,17 +5648,6 @@ ] } }, - { - "type": "org.osbuild.systemd-journald", - "options": { - "filename": "10-persistent.conf", - "config": { - "Journal": { - "Storage": "persistent" - } - } - } - }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_37-x86_64-iot_container-boot.json b/test/data/manifests/fedora_37-x86_64-iot_container-boot.json index 8cbf4cad1..1daaba9d8 100644 --- a/test/data/manifests/fedora_37-x86_64-iot_container-boot.json +++ b/test/data/manifests/fedora_37-x86_64-iot_container-boot.json @@ -5565,6 +5565,17 @@ "zone": "UTC" } }, + { + "type": "org.osbuild.systemd-journald", + "options": { + "filename": "10-persistent.conf", + "config": { + "Journal": { + "Storage": "persistent" + } + } + } + }, { "type": "org.osbuild.systemd", "options": { @@ -5588,17 +5599,6 @@ ] } }, - { - "type": "org.osbuild.systemd-journald", - "options": { - "filename": "10-persistent.conf", - "config": { - "Journal": { - "Storage": "persistent" - } - } - } - }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_37-x86_64-oci-boot.json b/test/data/manifests/fedora_37-x86_64-oci-boot.json index 343ca0e94..4def29d5d 100644 --- a/test/data/manifests/fedora_37-x86_64-oci-boot.json +++ b/test/data/manifests/fedora_37-x86_64-oci-boot.json @@ -4923,18 +4923,6 @@ "zone": "UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service", - "cloud-config.service", - "cloud-final.service", - "cloud-init-local.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.fstab", "options": { @@ -4978,6 +4966,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service", + "cloud-config.service", + "cloud-final.service", + "cloud-init-local.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_37-x86_64-openstack-boot.json b/test/data/manifests/fedora_37-x86_64-openstack-boot.json index 7c1203650..dea21994d 100644 --- a/test/data/manifests/fedora_37-x86_64-openstack-boot.json +++ b/test/data/manifests/fedora_37-x86_64-openstack-boot.json @@ -5128,17 +5128,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service", - "cloud-config.service", - "cloud-final.service", - "cloud-init-local.service" - ] - } - }, { "type": "org.osbuild.fstab", "options": { @@ -5182,6 +5171,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service", + "cloud-config.service", + "cloud-final.service", + "cloud-init-local.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_37-x86_64-qcow2-boot.json b/test/data/manifests/fedora_37-x86_64-qcow2-boot.json index b60468e52..ff232b578 100644 --- a/test/data/manifests/fedora_37-x86_64-qcow2-boot.json +++ b/test/data/manifests/fedora_37-x86_64-qcow2-boot.json @@ -4944,18 +4944,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service", - "cloud-config.service", - "cloud-final.service", - "cloud-init-local.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.fstab", "options": { @@ -4999,6 +4987,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service", + "cloud-config.service", + "cloud-final.service", + "cloud-init-local.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_37-x86_64-qcow2_customize-boot.json b/test/data/manifests/fedora_37-x86_64-qcow2_customize-boot.json index 3a362ae45..e347c3eb6 100644 --- a/test/data/manifests/fedora_37-x86_64-qcow2_customize-boot.json +++ b/test/data/manifests/fedora_37-x86_64-qcow2_customize-boot.json @@ -5367,22 +5367,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service", - "cloud-config.service", - "cloud-final.service", - "cloud-init-local.service", - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.fstab", "options": { @@ -5432,6 +5416,22 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service", + "cloud-config.service", + "cloud-final.service", + "cloud-init-local.service", + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_37-x86_64-vhd-boot.json b/test/data/manifests/fedora_37-x86_64-vhd-boot.json index c7f2d6657..34adf5df9 100644 --- a/test/data/manifests/fedora_37-x86_64-vhd-boot.json +++ b/test/data/manifests/fedora_37-x86_64-vhd-boot.json @@ -4824,20 +4824,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "waagent" - ], - "disabled_services": [ - "proc-sys-fs-binfmt_misc.mount", - "loadmodules.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.fstab", "options": { @@ -4881,6 +4867,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "waagent" + ], + "disabled_services": [ + "proc-sys-fs-binfmt_misc.mount", + "loadmodules.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_37-x86_64-vmdk-boot.json b/test/data/manifests/fedora_37-x86_64-vmdk-boot.json index a501c7805..f6fced247 100644 --- a/test/data/manifests/fedora_37-x86_64-vmdk-boot.json +++ b/test/data/manifests/fedora_37-x86_64-vmdk-boot.json @@ -4944,17 +4944,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service", - "cloud-config.service", - "cloud-final.service", - "cloud-init-local.service" - ] - } - }, { "type": "org.osbuild.fstab", "options": { @@ -4998,6 +4987,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service", + "cloud-config.service", + "cloud-final.service", + "cloud-init-local.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_38-aarch64-ami-boot.json b/test/data/manifests/fedora_38-aarch64-ami-boot.json index 3dc95f984..ace8ca0b2 100644 --- a/test/data/manifests/fedora_38-aarch64-ami-boot.json +++ b/test/data/manifests/fedora_38-aarch64-ami-boot.json @@ -4827,15 +4827,6 @@ "zone": "UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.fstab", "options": { @@ -4878,6 +4869,15 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_38-aarch64-iot_commit-boot.json b/test/data/manifests/fedora_38-aarch64-iot_commit-boot.json index 35ea770e3..83345d4ce 100644 --- a/test/data/manifests/fedora_38-aarch64-iot_commit-boot.json +++ b/test/data/manifests/fedora_38-aarch64-iot_commit-boot.json @@ -5277,6 +5277,17 @@ "zone": "UTC" } }, + { + "type": "org.osbuild.systemd-journald", + "options": { + "filename": "10-persistent.conf", + "config": { + "Journal": { + "Storage": "persistent" + } + } + } + }, { "type": "org.osbuild.systemd", "options": { @@ -5300,17 +5311,6 @@ ] } }, - { - "type": "org.osbuild.systemd-journald", - "options": { - "filename": "10-persistent.conf", - "config": { - "Journal": { - "Storage": "persistent" - } - } - } - }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_38-aarch64-iot_commit_with_container-boot.json b/test/data/manifests/fedora_38-aarch64-iot_commit_with_container-boot.json index 287c3ab09..9c2a22488 100644 --- a/test/data/manifests/fedora_38-aarch64-iot_commit_with_container-boot.json +++ b/test/data/manifests/fedora_38-aarch64-iot_commit_with_container-boot.json @@ -5326,6 +5326,17 @@ "zone": "UTC" } }, + { + "type": "org.osbuild.systemd-journald", + "options": { + "filename": "10-persistent.conf", + "config": { + "Journal": { + "Storage": "persistent" + } + } + } + }, { "type": "org.osbuild.systemd", "options": { @@ -5349,17 +5360,6 @@ ] } }, - { - "type": "org.osbuild.systemd-journald", - "options": { - "filename": "10-persistent.conf", - "config": { - "Journal": { - "Storage": "persistent" - } - } - } - }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_38-aarch64-iot_container-boot.json b/test/data/manifests/fedora_38-aarch64-iot_container-boot.json index 1ebd73c0a..50d36d047 100644 --- a/test/data/manifests/fedora_38-aarch64-iot_container-boot.json +++ b/test/data/manifests/fedora_38-aarch64-iot_container-boot.json @@ -5277,6 +5277,17 @@ "zone": "UTC" } }, + { + "type": "org.osbuild.systemd-journald", + "options": { + "filename": "10-persistent.conf", + "config": { + "Journal": { + "Storage": "persistent" + } + } + } + }, { "type": "org.osbuild.systemd", "options": { @@ -5300,17 +5311,6 @@ ] } }, - { - "type": "org.osbuild.systemd-journald", - "options": { - "filename": "10-persistent.conf", - "config": { - "Journal": { - "Storage": "persistent" - } - } - } - }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_38-aarch64-oci-boot.json b/test/data/manifests/fedora_38-aarch64-oci-boot.json index c0e531017..8315551b5 100644 --- a/test/data/manifests/fedora_38-aarch64-oci-boot.json +++ b/test/data/manifests/fedora_38-aarch64-oci-boot.json @@ -4819,18 +4819,6 @@ "zone": "UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service", - "cloud-config.service", - "cloud-final.service", - "cloud-init-local.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.fstab", "options": { @@ -4873,6 +4861,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service", + "cloud-config.service", + "cloud-final.service", + "cloud-init-local.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_38-aarch64-openstack-boot.json b/test/data/manifests/fedora_38-aarch64-openstack-boot.json index aa2b2ea3e..c023f0d22 100644 --- a/test/data/manifests/fedora_38-aarch64-openstack-boot.json +++ b/test/data/manifests/fedora_38-aarch64-openstack-boot.json @@ -5056,17 +5056,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service", - "cloud-config.service", - "cloud-final.service", - "cloud-init-local.service" - ] - } - }, { "type": "org.osbuild.fstab", "options": { @@ -5109,6 +5098,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service", + "cloud-config.service", + "cloud-final.service", + "cloud-init-local.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_38-aarch64-qcow2-boot.json b/test/data/manifests/fedora_38-aarch64-qcow2-boot.json index 56995bcf9..6d325625d 100644 --- a/test/data/manifests/fedora_38-aarch64-qcow2-boot.json +++ b/test/data/manifests/fedora_38-aarch64-qcow2-boot.json @@ -4840,18 +4840,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service", - "cloud-config.service", - "cloud-final.service", - "cloud-init-local.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.fstab", "options": { @@ -4894,6 +4882,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service", + "cloud-config.service", + "cloud-final.service", + "cloud-init-local.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_38-aarch64-qcow2_customize-boot.json b/test/data/manifests/fedora_38-aarch64-qcow2_customize-boot.json index 13741d8d3..bded063ff 100644 --- a/test/data/manifests/fedora_38-aarch64-qcow2_customize-boot.json +++ b/test/data/manifests/fedora_38-aarch64-qcow2_customize-boot.json @@ -5263,22 +5263,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service", - "cloud-config.service", - "cloud-final.service", - "cloud-init-local.service", - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.fstab", "options": { @@ -5327,6 +5311,22 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service", + "cloud-config.service", + "cloud-final.service", + "cloud-init-local.service", + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_38-x86_64-ami-boot.json b/test/data/manifests/fedora_38-x86_64-ami-boot.json index 75e44d639..bf3246f2c 100644 --- a/test/data/manifests/fedora_38-x86_64-ami-boot.json +++ b/test/data/manifests/fedora_38-x86_64-ami-boot.json @@ -4859,15 +4859,6 @@ "zone": "UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.fstab", "options": { @@ -4907,6 +4898,15 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_38-x86_64-iot_commit-boot.json b/test/data/manifests/fedora_38-x86_64-iot_commit-boot.json index a9627fa3d..17a448e10 100644 --- a/test/data/manifests/fedora_38-x86_64-iot_commit-boot.json +++ b/test/data/manifests/fedora_38-x86_64-iot_commit-boot.json @@ -5381,6 +5381,17 @@ "zone": "UTC" } }, + { + "type": "org.osbuild.systemd-journald", + "options": { + "filename": "10-persistent.conf", + "config": { + "Journal": { + "Storage": "persistent" + } + } + } + }, { "type": "org.osbuild.systemd", "options": { @@ -5404,17 +5415,6 @@ ] } }, - { - "type": "org.osbuild.systemd-journald", - "options": { - "filename": "10-persistent.conf", - "config": { - "Journal": { - "Storage": "persistent" - } - } - } - }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_38-x86_64-iot_commit_debug-boot.json b/test/data/manifests/fedora_38-x86_64-iot_commit_debug-boot.json index bf86c1aa6..d3d763694 100644 --- a/test/data/manifests/fedora_38-x86_64-iot_commit_debug-boot.json +++ b/test/data/manifests/fedora_38-x86_64-iot_commit_debug-boot.json @@ -5388,6 +5388,17 @@ "zone": "UTC" } }, + { + "type": "org.osbuild.systemd-journald", + "options": { + "filename": "10-persistent.conf", + "config": { + "Journal": { + "Storage": "persistent" + } + } + } + }, { "type": "org.osbuild.systemd", "options": { @@ -5411,17 +5422,6 @@ ] } }, - { - "type": "org.osbuild.systemd-journald", - "options": { - "filename": "10-persistent.conf", - "config": { - "Journal": { - "Storage": "persistent" - } - } - } - }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_38-x86_64-iot_commit_with_container-boot.json b/test/data/manifests/fedora_38-x86_64-iot_commit_with_container-boot.json index c15cace5f..7c48db788 100644 --- a/test/data/manifests/fedora_38-x86_64-iot_commit_with_container-boot.json +++ b/test/data/manifests/fedora_38-x86_64-iot_commit_with_container-boot.json @@ -5430,6 +5430,17 @@ "zone": "UTC" } }, + { + "type": "org.osbuild.systemd-journald", + "options": { + "filename": "10-persistent.conf", + "config": { + "Journal": { + "Storage": "persistent" + } + } + } + }, { "type": "org.osbuild.systemd", "options": { @@ -5453,17 +5464,6 @@ ] } }, - { - "type": "org.osbuild.systemd-journald", - "options": { - "filename": "10-persistent.conf", - "config": { - "Journal": { - "Storage": "persistent" - } - } - } - }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_38-x86_64-iot_container-boot.json b/test/data/manifests/fedora_38-x86_64-iot_container-boot.json index f2ee369b9..a0edb6239 100644 --- a/test/data/manifests/fedora_38-x86_64-iot_container-boot.json +++ b/test/data/manifests/fedora_38-x86_64-iot_container-boot.json @@ -5381,6 +5381,17 @@ "zone": "UTC" } }, + { + "type": "org.osbuild.systemd-journald", + "options": { + "filename": "10-persistent.conf", + "config": { + "Journal": { + "Storage": "persistent" + } + } + } + }, { "type": "org.osbuild.systemd", "options": { @@ -5404,17 +5415,6 @@ ] } }, - { - "type": "org.osbuild.systemd-journald", - "options": { - "filename": "10-persistent.conf", - "config": { - "Journal": { - "Storage": "persistent" - } - } - } - }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_38-x86_64-oci-boot.json b/test/data/manifests/fedora_38-x86_64-oci-boot.json index a7092d95d..9991cd84d 100644 --- a/test/data/manifests/fedora_38-x86_64-oci-boot.json +++ b/test/data/manifests/fedora_38-x86_64-oci-boot.json @@ -4923,18 +4923,6 @@ "zone": "UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service", - "cloud-config.service", - "cloud-final.service", - "cloud-init-local.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.fstab", "options": { @@ -4978,6 +4966,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service", + "cloud-config.service", + "cloud-final.service", + "cloud-init-local.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_38-x86_64-openstack-boot.json b/test/data/manifests/fedora_38-x86_64-openstack-boot.json index 327747ab2..7a91cd0a9 100644 --- a/test/data/manifests/fedora_38-x86_64-openstack-boot.json +++ b/test/data/manifests/fedora_38-x86_64-openstack-boot.json @@ -5128,17 +5128,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service", - "cloud-config.service", - "cloud-final.service", - "cloud-init-local.service" - ] - } - }, { "type": "org.osbuild.fstab", "options": { @@ -5182,6 +5171,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service", + "cloud-config.service", + "cloud-final.service", + "cloud-init-local.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_38-x86_64-qcow2-boot.json b/test/data/manifests/fedora_38-x86_64-qcow2-boot.json index 645ab4b64..a39aa9a10 100644 --- a/test/data/manifests/fedora_38-x86_64-qcow2-boot.json +++ b/test/data/manifests/fedora_38-x86_64-qcow2-boot.json @@ -4944,18 +4944,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service", - "cloud-config.service", - "cloud-final.service", - "cloud-init-local.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.fstab", "options": { @@ -4999,6 +4987,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service", + "cloud-config.service", + "cloud-final.service", + "cloud-init-local.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_38-x86_64-qcow2_customize-boot.json b/test/data/manifests/fedora_38-x86_64-qcow2_customize-boot.json index dff15de00..f6fb33d3e 100644 --- a/test/data/manifests/fedora_38-x86_64-qcow2_customize-boot.json +++ b/test/data/manifests/fedora_38-x86_64-qcow2_customize-boot.json @@ -5367,22 +5367,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service", - "cloud-config.service", - "cloud-final.service", - "cloud-init-local.service", - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.fstab", "options": { @@ -5432,6 +5416,22 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service", + "cloud-config.service", + "cloud-final.service", + "cloud-init-local.service", + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_38-x86_64-vhd-boot.json b/test/data/manifests/fedora_38-x86_64-vhd-boot.json index 553870f69..1e0832763 100644 --- a/test/data/manifests/fedora_38-x86_64-vhd-boot.json +++ b/test/data/manifests/fedora_38-x86_64-vhd-boot.json @@ -4824,20 +4824,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "waagent" - ], - "disabled_services": [ - "proc-sys-fs-binfmt_misc.mount", - "loadmodules.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.fstab", "options": { @@ -4881,6 +4867,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "waagent" + ], + "disabled_services": [ + "proc-sys-fs-binfmt_misc.mount", + "loadmodules.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/fedora_38-x86_64-vmdk-boot.json b/test/data/manifests/fedora_38-x86_64-vmdk-boot.json index 93174ad9f..81c68a15f 100644 --- a/test/data/manifests/fedora_38-x86_64-vmdk-boot.json +++ b/test/data/manifests/fedora_38-x86_64-vmdk-boot.json @@ -4944,17 +4944,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-init.service", - "cloud-config.service", - "cloud-final.service", - "cloud-init-local.service" - ] - } - }, { "type": "org.osbuild.fstab", "options": { @@ -4998,6 +4987,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-init.service", + "cloud-config.service", + "cloud-final.service", + "cloud-init-local.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_7-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_7-x86_64-azure_rhui-boot.json index b77fbb5d0..30b87447f 100644 --- a/test/data/manifests/rhel_7-x86_64-azure_rhui-boot.json +++ b/test/data/manifests/rhel_7-x86_64-azure_rhui-boot.json @@ -2283,22 +2283,6 @@ "zone": "Etc/UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "cloud-config", - "cloud-final", - "cloud-init-local", - "cloud-init", - "firewalld", - "NetworkManager", - "sshd", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2627,6 +2611,22 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "cloud-config", + "cloud-final", + "cloud-init-local", + "cloud-init", + "firewalld", + "NetworkManager", + "sshd", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_7-x86_64-qcow2-boot.json b/test/data/manifests/rhel_7-x86_64-qcow2-boot.json index f311d139c..00d31d936 100644 --- a/test/data/manifests/rhel_7-x86_64-qcow2-boot.json +++ b/test/data/manifests/rhel_7-x86_64-qcow2-boot.json @@ -1616,12 +1616,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1728,6 +1722,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_7-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_7-x86_64-qcow2_customize-boot.json index 40cdf54e0..1169623f9 100644 --- a/test/data/manifests/rhel_7-x86_64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_7-x86_64-qcow2_customize-boot.json @@ -1913,18 +1913,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2046,6 +2034,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_8-aarch64-ami-boot.json b/test/data/manifests/rhel_8-aarch64-ami-boot.json index 713872534..b9fdca2c1 100644 --- a/test/data/manifests/rhel_8-aarch64-ami-boot.json +++ b/test/data/manifests/rhel_8-aarch64-ami-boot.json @@ -1900,23 +1900,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2087,6 +2070,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_8-aarch64-azure_rhui-boot.json b/test/data/manifests/rhel_8-aarch64-azure_rhui-boot.json index a7ca74aa6..5a245e821 100644 --- a/test/data/manifests/rhel_8-aarch64-azure_rhui-boot.json +++ b/test/data/manifests/rhel_8-aarch64-azure_rhui-boot.json @@ -2499,20 +2499,6 @@ "zone": "Etc/UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "systemd-resolved", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2805,6 +2791,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "systemd-resolved", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_8-aarch64-ec2-boot.json b/test/data/manifests/rhel_8-aarch64-ec2-boot.json index efd9bfa54..3b3d49ab2 100644 --- a/test/data/manifests/rhel_8-aarch64-ec2-boot.json +++ b/test/data/manifests/rhel_8-aarch64-ec2-boot.json @@ -1910,23 +1910,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2087,6 +2070,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_8-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_8-aarch64-edge_commit-boot.json index 9cbae9ac4..1ef201823 100644 --- a/test/data/manifests/rhel_8-aarch64-edge_commit-boot.json +++ b/test/data/manifests/rhel_8-aarch64-edge_commit-boot.json @@ -1803,17 +1803,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1846,6 +1835,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_8-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_8-aarch64-edge_commit_with_container-boot.json index 311d7ec93..84e24ad50 100644 --- a/test/data/manifests/rhel_8-aarch64-edge_commit_with_container-boot.json +++ b/test/data/manifests/rhel_8-aarch64-edge_commit_with_container-boot.json @@ -1928,17 +1928,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1971,6 +1960,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_8-aarch64-edge_container-boot.json b/test/data/manifests/rhel_8-aarch64-edge_container-boot.json index 173bf9064..ae1d69421 100644 --- a/test/data/manifests/rhel_8-aarch64-edge_container-boot.json +++ b/test/data/manifests/rhel_8-aarch64-edge_container-boot.json @@ -1803,17 +1803,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1846,6 +1835,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_8-aarch64-qcow2-boot.json b/test/data/manifests/rhel_8-aarch64-qcow2-boot.json index 3f0d3c437..d5dfe1583 100644 --- a/test/data/manifests/rhel_8-aarch64-qcow2-boot.json +++ b/test/data/manifests/rhel_8-aarch64-qcow2-boot.json @@ -1980,12 +1980,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2054,6 +2048,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_8-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_8-aarch64-qcow2_customize-boot.json index d990eb310..0970e7d06 100644 --- a/test/data/manifests/rhel_8-aarch64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_8-aarch64-qcow2_customize-boot.json @@ -2234,18 +2234,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2327,6 +2315,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_8-aarch64-vhd-boot.json b/test/data/manifests/rhel_8-aarch64-vhd-boot.json index 847a7a4af..0e2f3f35d 100644 --- a/test/data/manifests/rhel_8-aarch64-vhd-boot.json +++ b/test/data/manifests/rhel_8-aarch64-vhd-boot.json @@ -2489,20 +2489,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "systemd-resolved", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2756,6 +2742,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "systemd-resolved", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_8-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_8-ppc64le-qcow2-boot.json index f77a37c23..6bec352f3 100644 --- a/test/data/manifests/rhel_8-ppc64le-qcow2-boot.json +++ b/test/data/manifests/rhel_8-ppc64le-qcow2-boot.json @@ -2130,12 +2130,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2195,6 +2189,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_8-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_8-ppc64le-qcow2_customize-boot.json index 4facc9a5c..12fe10e90 100644 --- a/test/data/manifests/rhel_8-ppc64le-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_8-ppc64le-qcow2_customize-boot.json @@ -2384,18 +2384,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2468,6 +2456,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_8-s390x-qcow2-boot.json b/test/data/manifests/rhel_8-s390x-qcow2-boot.json index 649daf1f1..a0e7ecaf4 100644 --- a/test/data/manifests/rhel_8-s390x-qcow2-boot.json +++ b/test/data/manifests/rhel_8-s390x-qcow2-boot.json @@ -2144,12 +2144,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2201,6 +2195,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_8-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_8-s390x-qcow2_customize-boot.json index 7b57abcf5..beddd24d5 100644 --- a/test/data/manifests/rhel_8-s390x-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_8-s390x-qcow2_customize-boot.json @@ -2401,18 +2401,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2476,6 +2464,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_8-x86_64-ami-boot.json b/test/data/manifests/rhel_8-x86_64-ami-boot.json index 69649e821..cbbf7db81 100644 --- a/test/data/manifests/rhel_8-x86_64-ami-boot.json +++ b/test/data/manifests/rhel_8-x86_64-ami-boot.json @@ -1826,23 +1826,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2009,6 +1992,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_8-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_8-x86_64-azure_rhui-boot.json index ab6cc7dad..914854db7 100644 --- a/test/data/manifests/rhel_8-x86_64-azure_rhui-boot.json +++ b/test/data/manifests/rhel_8-x86_64-azure_rhui-boot.json @@ -2550,20 +2550,6 @@ "zone": "Etc/UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "systemd-resolved", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2857,6 +2843,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "systemd-resolved", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_8-x86_64-azure_sap_rhui-boot.json b/test/data/manifests/rhel_8-x86_64-azure_sap_rhui-boot.json index 5da55e5a8..493bc89cf 100644 --- a/test/data/manifests/rhel_8-x86_64-azure_sap_rhui-boot.json +++ b/test/data/manifests/rhel_8-x86_64-azure_sap_rhui-boot.json @@ -3091,20 +3091,6 @@ "zone": "Etc/UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "systemd-resolved", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -3515,6 +3501,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "systemd-resolved", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_8-x86_64-ec2-boot.json b/test/data/manifests/rhel_8-x86_64-ec2-boot.json index 19fc7f516..8cdcbc2ed 100644 --- a/test/data/manifests/rhel_8-x86_64-ec2-boot.json +++ b/test/data/manifests/rhel_8-x86_64-ec2-boot.json @@ -1838,23 +1838,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2011,6 +1994,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_8-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_8-x86_64-ec2_ha-boot.json index 4f7e07c44..18b44e906 100644 --- a/test/data/manifests/rhel_8-x86_64-ec2_ha-boot.json +++ b/test/data/manifests/rhel_8-x86_64-ec2_ha-boot.json @@ -2371,23 +2371,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2544,6 +2527,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_8-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_8-x86_64-ec2_sap-boot.json index 30b21a3fd..e693c2ac9 100644 --- a/test/data/manifests/rhel_8-x86_64-ec2_sap-boot.json +++ b/test/data/manifests/rhel_8-x86_64-ec2_sap-boot.json @@ -3086,23 +3086,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -3376,6 +3359,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_8-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_8-x86_64-edge_commit-boot.json index ec4b7bbfe..3f9e19a73 100644 --- a/test/data/manifests/rhel_8-x86_64-edge_commit-boot.json +++ b/test/data/manifests/rhel_8-x86_64-edge_commit-boot.json @@ -1873,17 +1873,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1916,6 +1905,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_8-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_8-x86_64-edge_commit_rt-boot.json index 518b99a0e..c4d9d425f 100644 --- a/test/data/manifests/rhel_8-x86_64-edge_commit_rt-boot.json +++ b/test/data/manifests/rhel_8-x86_64-edge_commit_rt-boot.json @@ -1946,17 +1946,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1989,6 +1978,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_8-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_8-x86_64-edge_commit_with_container-boot.json index 56e2ac4e3..b39ce009c 100644 --- a/test/data/manifests/rhel_8-x86_64-edge_commit_with_container-boot.json +++ b/test/data/manifests/rhel_8-x86_64-edge_commit_with_container-boot.json @@ -1998,17 +1998,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2041,6 +2030,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_8-x86_64-edge_container-boot.json b/test/data/manifests/rhel_8-x86_64-edge_container-boot.json index a7b72eca8..7135ef250 100644 --- a/test/data/manifests/rhel_8-x86_64-edge_container-boot.json +++ b/test/data/manifests/rhel_8-x86_64-edge_container-boot.json @@ -1863,17 +1863,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1906,6 +1895,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_8-x86_64-gce-boot.json b/test/data/manifests/rhel_8-x86_64-gce-boot.json index 82a80f019..4ccdabf0d 100644 --- a/test/data/manifests/rhel_8-x86_64-gce-boot.json +++ b/test/data/manifests/rhel_8-x86_64-gce-boot.json @@ -2010,21 +2010,6 @@ ] } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "rngd", - "dnf-automatic.timer" - ], - "disabled_services": [ - "sshd-keygen@", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.firewall", "options": { @@ -2169,6 +2154,21 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "rngd", + "dnf-automatic.timer" + ], + "disabled_services": [ + "sshd-keygen@", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_8-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_8-x86_64-gce_rhui-boot.json index fd157c2a1..430eaedf5 100644 --- a/test/data/manifests/rhel_8-x86_64-gce_rhui-boot.json +++ b/test/data/manifests/rhel_8-x86_64-gce_rhui-boot.json @@ -2018,21 +2018,6 @@ ] } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "rngd", - "dnf-automatic.timer" - ], - "disabled_services": [ - "sshd-keygen@", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.firewall", "options": { @@ -2180,6 +2165,21 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "rngd", + "dnf-automatic.timer" + ], + "disabled_services": [ + "sshd-keygen@", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_8-x86_64-oci-boot.json b/test/data/manifests/rhel_8-x86_64-oci-boot.json index 5ed7f2ea7..d0fa6953b 100644 --- a/test/data/manifests/rhel_8-x86_64-oci-boot.json +++ b/test/data/manifests/rhel_8-x86_64-oci-boot.json @@ -1986,12 +1986,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2061,6 +2055,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_8-x86_64-qcow2-boot.json b/test/data/manifests/rhel_8-x86_64-qcow2-boot.json index 980622807..e2a79ceb9 100644 --- a/test/data/manifests/rhel_8-x86_64-qcow2-boot.json +++ b/test/data/manifests/rhel_8-x86_64-qcow2-boot.json @@ -2007,12 +2007,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2082,6 +2076,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_8-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_8-x86_64-qcow2_customize-boot.json index b3bd4062e..b5d7401a7 100644 --- a/test/data/manifests/rhel_8-x86_64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_8-x86_64-qcow2_customize-boot.json @@ -2264,18 +2264,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2358,6 +2346,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_8-x86_64-vhd-boot.json b/test/data/manifests/rhel_8-x86_64-vhd-boot.json index f85d46c7a..b539a2ba7 100644 --- a/test/data/manifests/rhel_8-x86_64-vhd-boot.json +++ b/test/data/manifests/rhel_8-x86_64-vhd-boot.json @@ -2540,20 +2540,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "systemd-resolved", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2808,6 +2794,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "systemd-resolved", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_84-aarch64-ami-boot.json b/test/data/manifests/rhel_84-aarch64-ami-boot.json index 1a4668057..d3e85438c 100644 --- a/test/data/manifests/rhel_84-aarch64-ami-boot.json +++ b/test/data/manifests/rhel_84-aarch64-ami-boot.json @@ -1936,23 +1936,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2123,6 +2106,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_84-aarch64-ec2-boot.json b/test/data/manifests/rhel_84-aarch64-ec2-boot.json index ae5ed93dd..6e07856a5 100644 --- a/test/data/manifests/rhel_84-aarch64-ec2-boot.json +++ b/test/data/manifests/rhel_84-aarch64-ec2-boot.json @@ -1949,23 +1949,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2139,6 +2122,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_84-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_84-aarch64-edge_commit-boot.json index f9025adc8..17c433800 100644 --- a/test/data/manifests/rhel_84-aarch64-edge_commit-boot.json +++ b/test/data/manifests/rhel_84-aarch64-edge_commit-boot.json @@ -1824,24 +1824,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "greenboot-grub2-set-counter", - "greenboot-grub2-set-success", - "greenboot-healthcheck", - "greenboot-rpm-ostree-grub2-check-fallback", - "greenboot-status", - "greenboot-task-runner", - "redboot-auto-reboot", - "redboot-task-runner" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1874,6 +1856,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "greenboot-grub2-set-counter", + "greenboot-grub2-set-success", + "greenboot-healthcheck", + "greenboot-rpm-ostree-grub2-check-fallback", + "greenboot-status", + "greenboot-task-runner", + "redboot-auto-reboot", + "redboot-task-runner" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_84-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_84-aarch64-edge_commit_with_container-boot.json index a2b090a75..6a63178b6 100644 --- a/test/data/manifests/rhel_84-aarch64-edge_commit_with_container-boot.json +++ b/test/data/manifests/rhel_84-aarch64-edge_commit_with_container-boot.json @@ -1889,24 +1889,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "greenboot-grub2-set-counter", - "greenboot-grub2-set-success", - "greenboot-healthcheck", - "greenboot-rpm-ostree-grub2-check-fallback", - "greenboot-status", - "greenboot-task-runner", - "redboot-auto-reboot", - "redboot-task-runner" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1939,6 +1921,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "greenboot-grub2-set-counter", + "greenboot-grub2-set-success", + "greenboot-healthcheck", + "greenboot-rpm-ostree-grub2-check-fallback", + "greenboot-status", + "greenboot-task-runner", + "redboot-auto-reboot", + "redboot-task-runner" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_84-aarch64-edge_container-boot.json b/test/data/manifests/rhel_84-aarch64-edge_container-boot.json index 9e9e9bc1e..545b06aa5 100644 --- a/test/data/manifests/rhel_84-aarch64-edge_container-boot.json +++ b/test/data/manifests/rhel_84-aarch64-edge_container-boot.json @@ -1824,24 +1824,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "greenboot-grub2-set-counter", - "greenboot-grub2-set-success", - "greenboot-healthcheck", - "greenboot-rpm-ostree-grub2-check-fallback", - "greenboot-status", - "greenboot-task-runner", - "redboot-auto-reboot", - "redboot-task-runner" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1874,6 +1856,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "greenboot-grub2-set-counter", + "greenboot-grub2-set-success", + "greenboot-healthcheck", + "greenboot-rpm-ostree-grub2-check-fallback", + "greenboot-status", + "greenboot-task-runner", + "redboot-auto-reboot", + "redboot-task-runner" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_84-aarch64-qcow2-boot.json b/test/data/manifests/rhel_84-aarch64-qcow2-boot.json index f294aee30..7b9fb175b 100644 --- a/test/data/manifests/rhel_84-aarch64-qcow2-boot.json +++ b/test/data/manifests/rhel_84-aarch64-qcow2-boot.json @@ -2001,12 +2001,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2075,6 +2069,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_84-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_84-aarch64-qcow2_customize-boot.json index bc6be2261..dc1995247 100644 --- a/test/data/manifests/rhel_84-aarch64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_84-aarch64-qcow2_customize-boot.json @@ -2205,18 +2205,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2285,6 +2273,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_84-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_84-ppc64le-qcow2-boot.json index 0462d6818..28e353282 100644 --- a/test/data/manifests/rhel_84-ppc64le-qcow2-boot.json +++ b/test/data/manifests/rhel_84-ppc64le-qcow2-boot.json @@ -2151,12 +2151,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2216,6 +2210,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_84-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_84-ppc64le-qcow2_customize-boot.json index dcd632c04..f167816ff 100644 --- a/test/data/manifests/rhel_84-ppc64le-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_84-ppc64le-qcow2_customize-boot.json @@ -2355,18 +2355,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2426,6 +2414,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_84-s390x-qcow2-boot.json b/test/data/manifests/rhel_84-s390x-qcow2-boot.json index 745ef1d7a..c611b5ce7 100644 --- a/test/data/manifests/rhel_84-s390x-qcow2-boot.json +++ b/test/data/manifests/rhel_84-s390x-qcow2-boot.json @@ -2162,12 +2162,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2219,6 +2213,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_84-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_84-s390x-qcow2_customize-boot.json index 5c8ea6a77..2c47d6b47 100644 --- a/test/data/manifests/rhel_84-s390x-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_84-s390x-qcow2_customize-boot.json @@ -2366,18 +2366,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2429,6 +2417,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_84-x86_64-ami-boot.json b/test/data/manifests/rhel_84-x86_64-ami-boot.json index 39c7f9294..de0f6e34b 100644 --- a/test/data/manifests/rhel_84-x86_64-ami-boot.json +++ b/test/data/manifests/rhel_84-x86_64-ami-boot.json @@ -1856,23 +1856,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2039,6 +2022,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_84-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_84-x86_64-azure_rhui-boot.json index 9867d65c5..0d7450e45 100644 --- a/test/data/manifests/rhel_84-x86_64-azure_rhui-boot.json +++ b/test/data/manifests/rhel_84-x86_64-azure_rhui-boot.json @@ -2583,20 +2583,6 @@ "zone": "Etc/UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "systemd-resolved", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2890,6 +2876,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "systemd-resolved", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_84-x86_64-azure_sap_rhui-boot.json b/test/data/manifests/rhel_84-x86_64-azure_sap_rhui-boot.json index e0217125e..f7b3ac3ec 100644 --- a/test/data/manifests/rhel_84-x86_64-azure_sap_rhui-boot.json +++ b/test/data/manifests/rhel_84-x86_64-azure_sap_rhui-boot.json @@ -3084,20 +3084,6 @@ "zone": "Etc/UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "systemd-resolved", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -3508,6 +3494,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "systemd-resolved", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_84-x86_64-ec2-boot.json b/test/data/manifests/rhel_84-x86_64-ec2-boot.json index 7df3969bd..8811ff4c4 100644 --- a/test/data/manifests/rhel_84-x86_64-ec2-boot.json +++ b/test/data/manifests/rhel_84-x86_64-ec2-boot.json @@ -1871,23 +1871,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2057,6 +2040,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_84-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_84-x86_64-ec2_ha-boot.json index 0d133fe0b..2e432999f 100644 --- a/test/data/manifests/rhel_84-x86_64-ec2_ha-boot.json +++ b/test/data/manifests/rhel_84-x86_64-ec2_ha-boot.json @@ -2407,23 +2407,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2593,6 +2576,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_84-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_84-x86_64-ec2_sap-boot.json index 1e5ad00aa..814826256 100644 --- a/test/data/manifests/rhel_84-x86_64-ec2_sap-boot.json +++ b/test/data/manifests/rhel_84-x86_64-ec2_sap-boot.json @@ -3060,23 +3060,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -3363,6 +3346,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_84-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_84-x86_64-edge_commit-boot.json index 54bb09610..f22f2995e 100644 --- a/test/data/manifests/rhel_84-x86_64-edge_commit-boot.json +++ b/test/data/manifests/rhel_84-x86_64-edge_commit-boot.json @@ -1894,24 +1894,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "greenboot-grub2-set-counter", - "greenboot-grub2-set-success", - "greenboot-healthcheck", - "greenboot-rpm-ostree-grub2-check-fallback", - "greenboot-status", - "greenboot-task-runner", - "redboot-auto-reboot", - "redboot-task-runner" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1944,6 +1926,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "greenboot-grub2-set-counter", + "greenboot-grub2-set-success", + "greenboot-healthcheck", + "greenboot-rpm-ostree-grub2-check-fallback", + "greenboot-status", + "greenboot-task-runner", + "redboot-auto-reboot", + "redboot-task-runner" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_84-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_84-x86_64-edge_commit_rt-boot.json index 618314055..dc4f2426d 100644 --- a/test/data/manifests/rhel_84-x86_64-edge_commit_rt-boot.json +++ b/test/data/manifests/rhel_84-x86_64-edge_commit_rt-boot.json @@ -1970,24 +1970,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "greenboot-grub2-set-counter", - "greenboot-grub2-set-success", - "greenboot-healthcheck", - "greenboot-rpm-ostree-grub2-check-fallback", - "greenboot-status", - "greenboot-task-runner", - "redboot-auto-reboot", - "redboot-task-runner" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2020,6 +2002,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "greenboot-grub2-set-counter", + "greenboot-grub2-set-success", + "greenboot-healthcheck", + "greenboot-rpm-ostree-grub2-check-fallback", + "greenboot-status", + "greenboot-task-runner", + "redboot-auto-reboot", + "redboot-task-runner" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_84-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_84-x86_64-edge_commit_with_container-boot.json index 7b9d31dd4..99cb91709 100644 --- a/test/data/manifests/rhel_84-x86_64-edge_commit_with_container-boot.json +++ b/test/data/manifests/rhel_84-x86_64-edge_commit_with_container-boot.json @@ -1959,24 +1959,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "greenboot-grub2-set-counter", - "greenboot-grub2-set-success", - "greenboot-healthcheck", - "greenboot-rpm-ostree-grub2-check-fallback", - "greenboot-status", - "greenboot-task-runner", - "redboot-auto-reboot", - "redboot-task-runner" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2009,6 +1991,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "greenboot-grub2-set-counter", + "greenboot-grub2-set-success", + "greenboot-healthcheck", + "greenboot-rpm-ostree-grub2-check-fallback", + "greenboot-status", + "greenboot-task-runner", + "redboot-auto-reboot", + "redboot-task-runner" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_84-x86_64-edge_container-boot.json b/test/data/manifests/rhel_84-x86_64-edge_container-boot.json index d222dc6e5..7bddf226d 100644 --- a/test/data/manifests/rhel_84-x86_64-edge_container-boot.json +++ b/test/data/manifests/rhel_84-x86_64-edge_container-boot.json @@ -1884,24 +1884,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "greenboot-grub2-set-counter", - "greenboot-grub2-set-success", - "greenboot-healthcheck", - "greenboot-rpm-ostree-grub2-check-fallback", - "greenboot-status", - "greenboot-task-runner", - "redboot-auto-reboot", - "redboot-task-runner" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1934,6 +1916,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "greenboot-grub2-set-counter", + "greenboot-grub2-set-success", + "greenboot-healthcheck", + "greenboot-rpm-ostree-grub2-check-fallback", + "greenboot-status", + "greenboot-task-runner", + "redboot-auto-reboot", + "redboot-task-runner" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_84-x86_64-gce-boot.json b/test/data/manifests/rhel_84-x86_64-gce-boot.json index 166fd95ab..375259326 100644 --- a/test/data/manifests/rhel_84-x86_64-gce-boot.json +++ b/test/data/manifests/rhel_84-x86_64-gce-boot.json @@ -2043,26 +2043,6 @@ ] } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "rngd", - "dnf-automatic.timer", - "google-oslogin-cache.timer", - "google-guest-agent.service", - "google-shutdown-scripts.service", - "google-startup-scripts.service", - "google-osconfig-agent.service" - ], - "disabled_services": [ - "sshd-keygen@", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.firewall", "options": { @@ -2207,6 +2187,26 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "rngd", + "dnf-automatic.timer", + "google-oslogin-cache.timer", + "google-guest-agent.service", + "google-shutdown-scripts.service", + "google-startup-scripts.service", + "google-osconfig-agent.service" + ], + "disabled_services": [ + "sshd-keygen@", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_84-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_84-x86_64-gce_rhui-boot.json index f31fce34e..e024476f0 100644 --- a/test/data/manifests/rhel_84-x86_64-gce_rhui-boot.json +++ b/test/data/manifests/rhel_84-x86_64-gce_rhui-boot.json @@ -2051,26 +2051,6 @@ ] } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "rngd", - "dnf-automatic.timer", - "google-oslogin-cache.timer", - "google-guest-agent.service", - "google-shutdown-scripts.service", - "google-startup-scripts.service", - "google-osconfig-agent.service" - ], - "disabled_services": [ - "sshd-keygen@", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.firewall", "options": { @@ -2218,6 +2198,26 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "rngd", + "dnf-automatic.timer", + "google-oslogin-cache.timer", + "google-guest-agent.service", + "google-shutdown-scripts.service", + "google-startup-scripts.service", + "google-osconfig-agent.service" + ], + "disabled_services": [ + "sshd-keygen@", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_84-x86_64-oci-boot.json b/test/data/manifests/rhel_84-x86_64-oci-boot.json index 21d5024d8..2458445d7 100644 --- a/test/data/manifests/rhel_84-x86_64-oci-boot.json +++ b/test/data/manifests/rhel_84-x86_64-oci-boot.json @@ -2010,12 +2010,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2085,6 +2079,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_84-x86_64-qcow2-boot.json b/test/data/manifests/rhel_84-x86_64-qcow2-boot.json index 5bcc35c4b..053d423f1 100644 --- a/test/data/manifests/rhel_84-x86_64-qcow2-boot.json +++ b/test/data/manifests/rhel_84-x86_64-qcow2-boot.json @@ -2031,12 +2031,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2106,6 +2100,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_84-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_84-x86_64-qcow2_customize-boot.json index dc6e0cea3..5bb01b2a6 100644 --- a/test/data/manifests/rhel_84-x86_64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_84-x86_64-qcow2_customize-boot.json @@ -2238,18 +2238,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2319,6 +2307,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_84-x86_64-vhd-boot.json b/test/data/manifests/rhel_84-x86_64-vhd-boot.json index 2ce98f990..60d2d91cc 100644 --- a/test/data/manifests/rhel_84-x86_64-vhd-boot.json +++ b/test/data/manifests/rhel_84-x86_64-vhd-boot.json @@ -2573,20 +2573,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "systemd-resolved", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2841,6 +2827,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "systemd-resolved", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_85-aarch64-ami-boot.json b/test/data/manifests/rhel_85-aarch64-ami-boot.json index 04a89abf5..555a7c4ef 100644 --- a/test/data/manifests/rhel_85-aarch64-ami-boot.json +++ b/test/data/manifests/rhel_85-aarch64-ami-boot.json @@ -1900,23 +1900,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2087,6 +2070,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_85-aarch64-ec2-boot.json b/test/data/manifests/rhel_85-aarch64-ec2-boot.json index 9d1c2f8b4..5b6ff9ba7 100644 --- a/test/data/manifests/rhel_85-aarch64-ec2-boot.json +++ b/test/data/manifests/rhel_85-aarch64-ec2-boot.json @@ -1913,23 +1913,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2103,6 +2086,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_85-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_85-aarch64-edge_commit-boot.json index 3a2a6cfea..d39f0fc7a 100644 --- a/test/data/manifests/rhel_85-aarch64-edge_commit-boot.json +++ b/test/data/manifests/rhel_85-aarch64-edge_commit-boot.json @@ -1773,16 +1773,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1815,6 +1805,16 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_85-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_85-aarch64-edge_commit_with_container-boot.json index 759ef7003..326fbdf79 100644 --- a/test/data/manifests/rhel_85-aarch64-edge_commit_with_container-boot.json +++ b/test/data/manifests/rhel_85-aarch64-edge_commit_with_container-boot.json @@ -1910,16 +1910,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1952,6 +1942,16 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_85-aarch64-edge_container-boot.json b/test/data/manifests/rhel_85-aarch64-edge_container-boot.json index 3f279f3c9..dc0b6cf75 100644 --- a/test/data/manifests/rhel_85-aarch64-edge_container-boot.json +++ b/test/data/manifests/rhel_85-aarch64-edge_container-boot.json @@ -1773,16 +1773,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1815,6 +1805,16 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_85-aarch64-qcow2-boot.json b/test/data/manifests/rhel_85-aarch64-qcow2-boot.json index 816f174f8..d36ef8b36 100644 --- a/test/data/manifests/rhel_85-aarch64-qcow2-boot.json +++ b/test/data/manifests/rhel_85-aarch64-qcow2-boot.json @@ -1974,12 +1974,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2048,6 +2042,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_85-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_85-aarch64-qcow2_customize-boot.json index bde15ae68..37f8b01e8 100644 --- a/test/data/manifests/rhel_85-aarch64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_85-aarch64-qcow2_customize-boot.json @@ -2230,18 +2230,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2329,6 +2317,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_85-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_85-ppc64le-qcow2-boot.json index be8e2c570..c9a725ab3 100644 --- a/test/data/manifests/rhel_85-ppc64le-qcow2-boot.json +++ b/test/data/manifests/rhel_85-ppc64le-qcow2-boot.json @@ -2136,12 +2136,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2201,6 +2195,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_85-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_85-ppc64le-qcow2_customize-boot.json index 68b3aac6f..436192bfd 100644 --- a/test/data/manifests/rhel_85-ppc64le-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_85-ppc64le-qcow2_customize-boot.json @@ -2389,18 +2389,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2479,6 +2467,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_85-s390x-qcow2-boot.json b/test/data/manifests/rhel_85-s390x-qcow2-boot.json index 518761d14..6d0d35d97 100644 --- a/test/data/manifests/rhel_85-s390x-qcow2-boot.json +++ b/test/data/manifests/rhel_85-s390x-qcow2-boot.json @@ -2147,12 +2147,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2204,6 +2198,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_85-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_85-s390x-qcow2_customize-boot.json index 1346f56ec..b37430a92 100644 --- a/test/data/manifests/rhel_85-s390x-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_85-s390x-qcow2_customize-boot.json @@ -2403,18 +2403,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2484,6 +2472,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_85-x86_64-ami-boot.json b/test/data/manifests/rhel_85-x86_64-ami-boot.json index e433a8cdc..e933c9daf 100644 --- a/test/data/manifests/rhel_85-x86_64-ami-boot.json +++ b/test/data/manifests/rhel_85-x86_64-ami-boot.json @@ -1817,23 +1817,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2000,6 +1983,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_85-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_85-x86_64-azure_rhui-boot.json index d8162ab61..2521d4e8c 100644 --- a/test/data/manifests/rhel_85-x86_64-azure_rhui-boot.json +++ b/test/data/manifests/rhel_85-x86_64-azure_rhui-boot.json @@ -2556,20 +2556,6 @@ "zone": "Etc/UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "systemd-resolved", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2863,6 +2849,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "systemd-resolved", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_85-x86_64-azure_sap_rhui-boot.json b/test/data/manifests/rhel_85-x86_64-azure_sap_rhui-boot.json index 5aa47fa29..45cd0c580 100644 --- a/test/data/manifests/rhel_85-x86_64-azure_sap_rhui-boot.json +++ b/test/data/manifests/rhel_85-x86_64-azure_sap_rhui-boot.json @@ -3060,20 +3060,6 @@ "zone": "Etc/UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "systemd-resolved", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -3484,6 +3470,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "systemd-resolved", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_85-x86_64-ec2-boot.json b/test/data/manifests/rhel_85-x86_64-ec2-boot.json index 3f021d9bc..ee6e721a5 100644 --- a/test/data/manifests/rhel_85-x86_64-ec2-boot.json +++ b/test/data/manifests/rhel_85-x86_64-ec2-boot.json @@ -1831,23 +1831,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2017,6 +2000,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_85-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_85-x86_64-ec2_ha-boot.json index 4b5b01e1a..1292c0e8c 100644 --- a/test/data/manifests/rhel_85-x86_64-ec2_ha-boot.json +++ b/test/data/manifests/rhel_85-x86_64-ec2_ha-boot.json @@ -2363,23 +2363,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2549,6 +2532,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_85-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_85-x86_64-edge_commit-boot.json index f8b036fb1..40acbd7ce 100644 --- a/test/data/manifests/rhel_85-x86_64-edge_commit-boot.json +++ b/test/data/manifests/rhel_85-x86_64-edge_commit-boot.json @@ -1843,16 +1843,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1885,6 +1875,16 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_85-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_85-x86_64-edge_commit_rt-boot.json index ef6c389f5..a9233f650 100644 --- a/test/data/manifests/rhel_85-x86_64-edge_commit_rt-boot.json +++ b/test/data/manifests/rhel_85-x86_64-edge_commit_rt-boot.json @@ -1916,16 +1916,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1958,6 +1948,16 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_85-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_85-x86_64-edge_commit_with_container-boot.json index 8309a43df..578e4bb55 100644 --- a/test/data/manifests/rhel_85-x86_64-edge_commit_with_container-boot.json +++ b/test/data/manifests/rhel_85-x86_64-edge_commit_with_container-boot.json @@ -1980,16 +1980,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2022,6 +2012,16 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_85-x86_64-edge_container-boot.json b/test/data/manifests/rhel_85-x86_64-edge_container-boot.json index 14a595c1c..6cc3274ec 100644 --- a/test/data/manifests/rhel_85-x86_64-edge_container-boot.json +++ b/test/data/manifests/rhel_85-x86_64-edge_container-boot.json @@ -1833,16 +1833,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1875,6 +1865,16 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_85-x86_64-gce-boot.json b/test/data/manifests/rhel_85-x86_64-gce-boot.json index 9a967a14f..e02e3b40b 100644 --- a/test/data/manifests/rhel_85-x86_64-gce-boot.json +++ b/test/data/manifests/rhel_85-x86_64-gce-boot.json @@ -2016,21 +2016,6 @@ ] } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "rngd", - "dnf-automatic.timer" - ], - "disabled_services": [ - "sshd-keygen@", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.firewall", "options": { @@ -2175,6 +2160,21 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "rngd", + "dnf-automatic.timer" + ], + "disabled_services": [ + "sshd-keygen@", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_85-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_85-x86_64-gce_rhui-boot.json index 42c801a5d..675dfbd3d 100644 --- a/test/data/manifests/rhel_85-x86_64-gce_rhui-boot.json +++ b/test/data/manifests/rhel_85-x86_64-gce_rhui-boot.json @@ -2024,21 +2024,6 @@ ] } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "rngd", - "dnf-automatic.timer" - ], - "disabled_services": [ - "sshd-keygen@", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.firewall", "options": { @@ -2186,6 +2171,21 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "rngd", + "dnf-automatic.timer" + ], + "disabled_services": [ + "sshd-keygen@", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_85-x86_64-oci-boot.json b/test/data/manifests/rhel_85-x86_64-oci-boot.json index 675000e5d..273a8b0c7 100644 --- a/test/data/manifests/rhel_85-x86_64-oci-boot.json +++ b/test/data/manifests/rhel_85-x86_64-oci-boot.json @@ -1980,12 +1980,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2055,6 +2049,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_85-x86_64-qcow2-boot.json b/test/data/manifests/rhel_85-x86_64-qcow2-boot.json index 2c03e8373..3bae05124 100644 --- a/test/data/manifests/rhel_85-x86_64-qcow2-boot.json +++ b/test/data/manifests/rhel_85-x86_64-qcow2-boot.json @@ -2001,12 +2001,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2076,6 +2070,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_85-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_85-x86_64-qcow2_customize-boot.json index f8bef3e93..045cde6bf 100644 --- a/test/data/manifests/rhel_85-x86_64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_85-x86_64-qcow2_customize-boot.json @@ -2260,18 +2260,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2360,6 +2348,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_85-x86_64-vhd-boot.json b/test/data/manifests/rhel_85-x86_64-vhd-boot.json index 7d0d28611..aa5d6f0b3 100644 --- a/test/data/manifests/rhel_85-x86_64-vhd-boot.json +++ b/test/data/manifests/rhel_85-x86_64-vhd-boot.json @@ -2546,20 +2546,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "systemd-resolved", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2814,6 +2800,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "systemd-resolved", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_86-aarch64-ami-boot.json b/test/data/manifests/rhel_86-aarch64-ami-boot.json index b03c3a8a8..62878f62c 100644 --- a/test/data/manifests/rhel_86-aarch64-ami-boot.json +++ b/test/data/manifests/rhel_86-aarch64-ami-boot.json @@ -1903,23 +1903,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2090,6 +2073,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_86-aarch64-azure_rhui-boot.json b/test/data/manifests/rhel_86-aarch64-azure_rhui-boot.json index 0750ec7e5..905de8d71 100644 --- a/test/data/manifests/rhel_86-aarch64-azure_rhui-boot.json +++ b/test/data/manifests/rhel_86-aarch64-azure_rhui-boot.json @@ -2502,20 +2502,6 @@ "zone": "Etc/UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "systemd-resolved", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2808,6 +2794,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "systemd-resolved", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_86-aarch64-ec2-boot.json b/test/data/manifests/rhel_86-aarch64-ec2-boot.json index 468ce4c06..44751f932 100644 --- a/test/data/manifests/rhel_86-aarch64-ec2-boot.json +++ b/test/data/manifests/rhel_86-aarch64-ec2-boot.json @@ -1916,23 +1916,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2106,6 +2089,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_86-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_86-aarch64-edge_commit-boot.json index 240c5c6a3..25986b8bb 100644 --- a/test/data/manifests/rhel_86-aarch64-edge_commit-boot.json +++ b/test/data/manifests/rhel_86-aarch64-edge_commit-boot.json @@ -1797,17 +1797,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1840,6 +1829,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_86-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_86-aarch64-edge_commit_with_container-boot.json index 7b43f47ae..3dae2f682 100644 --- a/test/data/manifests/rhel_86-aarch64-edge_commit_with_container-boot.json +++ b/test/data/manifests/rhel_86-aarch64-edge_commit_with_container-boot.json @@ -1922,17 +1922,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1965,6 +1954,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_86-aarch64-edge_container-boot.json b/test/data/manifests/rhel_86-aarch64-edge_container-boot.json index d2ab990bb..80b6e7f91 100644 --- a/test/data/manifests/rhel_86-aarch64-edge_container-boot.json +++ b/test/data/manifests/rhel_86-aarch64-edge_container-boot.json @@ -1797,17 +1797,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1840,6 +1829,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_86-aarch64-qcow2-boot.json b/test/data/manifests/rhel_86-aarch64-qcow2-boot.json index ca84325b6..16654e66a 100644 --- a/test/data/manifests/rhel_86-aarch64-qcow2-boot.json +++ b/test/data/manifests/rhel_86-aarch64-qcow2-boot.json @@ -1977,12 +1977,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2051,6 +2045,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_86-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_86-aarch64-qcow2_customize-boot.json index b7bf44e63..fd8716024 100644 --- a/test/data/manifests/rhel_86-aarch64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_86-aarch64-qcow2_customize-boot.json @@ -2231,18 +2231,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2324,6 +2312,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_86-aarch64-vhd-boot.json b/test/data/manifests/rhel_86-aarch64-vhd-boot.json index 8d892fc6b..b3a927f35 100644 --- a/test/data/manifests/rhel_86-aarch64-vhd-boot.json +++ b/test/data/manifests/rhel_86-aarch64-vhd-boot.json @@ -2492,20 +2492,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "systemd-resolved", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2759,6 +2745,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "systemd-resolved", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_86-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_86-ppc64le-qcow2-boot.json index 24d4726f1..67fc23241 100644 --- a/test/data/manifests/rhel_86-ppc64le-qcow2-boot.json +++ b/test/data/manifests/rhel_86-ppc64le-qcow2-boot.json @@ -2127,12 +2127,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2192,6 +2186,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_86-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_86-ppc64le-qcow2_customize-boot.json index b353e8232..86a7df539 100644 --- a/test/data/manifests/rhel_86-ppc64le-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_86-ppc64le-qcow2_customize-boot.json @@ -2381,18 +2381,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2465,6 +2453,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_86-s390x-qcow2-boot.json b/test/data/manifests/rhel_86-s390x-qcow2-boot.json index cdc546a04..588ef86f6 100644 --- a/test/data/manifests/rhel_86-s390x-qcow2-boot.json +++ b/test/data/manifests/rhel_86-s390x-qcow2-boot.json @@ -2132,12 +2132,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2189,6 +2183,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_86-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_86-s390x-qcow2_customize-boot.json index e408aeb08..622b94c0c 100644 --- a/test/data/manifests/rhel_86-s390x-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_86-s390x-qcow2_customize-boot.json @@ -2389,18 +2389,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2464,6 +2452,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_86-x86_64-ami-boot.json b/test/data/manifests/rhel_86-x86_64-ami-boot.json index d4f600384..66676827e 100644 --- a/test/data/manifests/rhel_86-x86_64-ami-boot.json +++ b/test/data/manifests/rhel_86-x86_64-ami-boot.json @@ -1826,23 +1826,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2009,6 +1992,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_86-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_86-x86_64-azure_rhui-boot.json index 8a09fcf07..f9b1b05f9 100644 --- a/test/data/manifests/rhel_86-x86_64-azure_rhui-boot.json +++ b/test/data/manifests/rhel_86-x86_64-azure_rhui-boot.json @@ -2553,20 +2553,6 @@ "zone": "Etc/UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "systemd-resolved", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2860,6 +2846,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "systemd-resolved", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_86-x86_64-azure_sap_rhui-boot.json b/test/data/manifests/rhel_86-x86_64-azure_sap_rhui-boot.json index 6cb2b9cb1..ed3e6c8f9 100644 --- a/test/data/manifests/rhel_86-x86_64-azure_sap_rhui-boot.json +++ b/test/data/manifests/rhel_86-x86_64-azure_sap_rhui-boot.json @@ -3132,20 +3132,6 @@ "zone": "Etc/UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "systemd-resolved", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -3556,6 +3542,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "systemd-resolved", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_86-x86_64-ec2-boot.json b/test/data/manifests/rhel_86-x86_64-ec2-boot.json index d3d9cc043..13d4cb2b5 100644 --- a/test/data/manifests/rhel_86-x86_64-ec2-boot.json +++ b/test/data/manifests/rhel_86-x86_64-ec2-boot.json @@ -1841,23 +1841,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2027,6 +2010,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_86-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_86-x86_64-ec2_ha-boot.json index ae0ed3723..9aee7a5a6 100644 --- a/test/data/manifests/rhel_86-x86_64-ec2_ha-boot.json +++ b/test/data/manifests/rhel_86-x86_64-ec2_ha-boot.json @@ -2374,23 +2374,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2560,6 +2543,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_86-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_86-x86_64-ec2_sap-boot.json index 0c14bba56..103518080 100644 --- a/test/data/manifests/rhel_86-x86_64-ec2_sap-boot.json +++ b/test/data/manifests/rhel_86-x86_64-ec2_sap-boot.json @@ -3114,23 +3114,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -3417,6 +3400,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_86-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_86-x86_64-edge_commit-boot.json index d30bb9e8f..8022f52f4 100644 --- a/test/data/manifests/rhel_86-x86_64-edge_commit-boot.json +++ b/test/data/manifests/rhel_86-x86_64-edge_commit-boot.json @@ -1867,17 +1867,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1910,6 +1899,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_86-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_86-x86_64-edge_commit_rt-boot.json index d649b0e2f..bd178bc0e 100644 --- a/test/data/manifests/rhel_86-x86_64-edge_commit_rt-boot.json +++ b/test/data/manifests/rhel_86-x86_64-edge_commit_rt-boot.json @@ -1943,17 +1943,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1986,6 +1975,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_86-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_86-x86_64-edge_commit_with_container-boot.json index 3c8dc3631..1713c7829 100644 --- a/test/data/manifests/rhel_86-x86_64-edge_commit_with_container-boot.json +++ b/test/data/manifests/rhel_86-x86_64-edge_commit_with_container-boot.json @@ -1992,17 +1992,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2035,6 +2024,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_86-x86_64-edge_container-boot.json b/test/data/manifests/rhel_86-x86_64-edge_container-boot.json index 94f16fcb0..e0d624c9d 100644 --- a/test/data/manifests/rhel_86-x86_64-edge_container-boot.json +++ b/test/data/manifests/rhel_86-x86_64-edge_container-boot.json @@ -1857,17 +1857,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1900,6 +1889,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_86-x86_64-gce-boot.json b/test/data/manifests/rhel_86-x86_64-gce-boot.json index 8ea1d05e0..cd7027e04 100644 --- a/test/data/manifests/rhel_86-x86_64-gce-boot.json +++ b/test/data/manifests/rhel_86-x86_64-gce-boot.json @@ -2016,21 +2016,6 @@ ] } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "rngd", - "dnf-automatic.timer" - ], - "disabled_services": [ - "sshd-keygen@", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.firewall", "options": { @@ -2175,6 +2160,21 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "rngd", + "dnf-automatic.timer" + ], + "disabled_services": [ + "sshd-keygen@", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_86-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_86-x86_64-gce_rhui-boot.json index eb637a124..3f1292bdc 100644 --- a/test/data/manifests/rhel_86-x86_64-gce_rhui-boot.json +++ b/test/data/manifests/rhel_86-x86_64-gce_rhui-boot.json @@ -2024,21 +2024,6 @@ ] } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "rngd", - "dnf-automatic.timer" - ], - "disabled_services": [ - "sshd-keygen@", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.firewall", "options": { @@ -2186,6 +2171,21 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "rngd", + "dnf-automatic.timer" + ], + "disabled_services": [ + "sshd-keygen@", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_86-x86_64-oci-boot.json b/test/data/manifests/rhel_86-x86_64-oci-boot.json index 083b0d01d..a9654ad11 100644 --- a/test/data/manifests/rhel_86-x86_64-oci-boot.json +++ b/test/data/manifests/rhel_86-x86_64-oci-boot.json @@ -1983,12 +1983,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2058,6 +2052,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_86-x86_64-qcow2-boot.json b/test/data/manifests/rhel_86-x86_64-qcow2-boot.json index b90807c67..53e149861 100644 --- a/test/data/manifests/rhel_86-x86_64-qcow2-boot.json +++ b/test/data/manifests/rhel_86-x86_64-qcow2-boot.json @@ -2004,12 +2004,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2079,6 +2073,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_86-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_86-x86_64-qcow2_customize-boot.json index ceec1d998..7e0e2c89f 100644 --- a/test/data/manifests/rhel_86-x86_64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_86-x86_64-qcow2_customize-boot.json @@ -2261,18 +2261,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2355,6 +2343,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_86-x86_64-vhd-boot.json b/test/data/manifests/rhel_86-x86_64-vhd-boot.json index e1e7d91a6..f1da9a799 100644 --- a/test/data/manifests/rhel_86-x86_64-vhd-boot.json +++ b/test/data/manifests/rhel_86-x86_64-vhd-boot.json @@ -2543,20 +2543,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "systemd-resolved", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2811,6 +2797,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "systemd-resolved", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_87-aarch64-ami-boot.json b/test/data/manifests/rhel_87-aarch64-ami-boot.json index bee4f64c8..8c497709f 100644 --- a/test/data/manifests/rhel_87-aarch64-ami-boot.json +++ b/test/data/manifests/rhel_87-aarch64-ami-boot.json @@ -1900,23 +1900,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2087,6 +2070,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_87-aarch64-azure_rhui-boot.json b/test/data/manifests/rhel_87-aarch64-azure_rhui-boot.json index 315161911..cdc6564a9 100644 --- a/test/data/manifests/rhel_87-aarch64-azure_rhui-boot.json +++ b/test/data/manifests/rhel_87-aarch64-azure_rhui-boot.json @@ -2499,20 +2499,6 @@ "zone": "Etc/UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "systemd-resolved", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2805,6 +2791,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "systemd-resolved", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_87-aarch64-ec2-boot.json b/test/data/manifests/rhel_87-aarch64-ec2-boot.json index dbc9f6566..b7655d47e 100644 --- a/test/data/manifests/rhel_87-aarch64-ec2-boot.json +++ b/test/data/manifests/rhel_87-aarch64-ec2-boot.json @@ -1910,23 +1910,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2087,6 +2070,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_87-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_87-aarch64-edge_commit-boot.json index 7e8439066..7bc68ecd0 100644 --- a/test/data/manifests/rhel_87-aarch64-edge_commit-boot.json +++ b/test/data/manifests/rhel_87-aarch64-edge_commit-boot.json @@ -1803,17 +1803,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1846,6 +1835,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_87-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_87-aarch64-edge_commit_with_container-boot.json index cbb1b5921..22646a8a7 100644 --- a/test/data/manifests/rhel_87-aarch64-edge_commit_with_container-boot.json +++ b/test/data/manifests/rhel_87-aarch64-edge_commit_with_container-boot.json @@ -1928,17 +1928,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1971,6 +1960,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_87-aarch64-edge_container-boot.json b/test/data/manifests/rhel_87-aarch64-edge_container-boot.json index 708c49848..d5d0a863f 100644 --- a/test/data/manifests/rhel_87-aarch64-edge_container-boot.json +++ b/test/data/manifests/rhel_87-aarch64-edge_container-boot.json @@ -1803,17 +1803,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1846,6 +1835,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_87-aarch64-qcow2-boot.json b/test/data/manifests/rhel_87-aarch64-qcow2-boot.json index 9263b8bc1..e20312ca5 100644 --- a/test/data/manifests/rhel_87-aarch64-qcow2-boot.json +++ b/test/data/manifests/rhel_87-aarch64-qcow2-boot.json @@ -1980,12 +1980,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2054,6 +2048,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_87-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_87-aarch64-qcow2_customize-boot.json index fadab4ea4..4346a7ad8 100644 --- a/test/data/manifests/rhel_87-aarch64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_87-aarch64-qcow2_customize-boot.json @@ -2234,18 +2234,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2327,6 +2315,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_87-aarch64-vhd-boot.json b/test/data/manifests/rhel_87-aarch64-vhd-boot.json index bb02ab937..f840640c0 100644 --- a/test/data/manifests/rhel_87-aarch64-vhd-boot.json +++ b/test/data/manifests/rhel_87-aarch64-vhd-boot.json @@ -2489,20 +2489,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "systemd-resolved", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2756,6 +2742,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "systemd-resolved", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_87-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_87-ppc64le-qcow2-boot.json index 5cdc35982..c229d7ceb 100644 --- a/test/data/manifests/rhel_87-ppc64le-qcow2-boot.json +++ b/test/data/manifests/rhel_87-ppc64le-qcow2-boot.json @@ -2130,12 +2130,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2195,6 +2189,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_87-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_87-ppc64le-qcow2_customize-boot.json index 672bdaebc..c21b47509 100644 --- a/test/data/manifests/rhel_87-ppc64le-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_87-ppc64le-qcow2_customize-boot.json @@ -2384,18 +2384,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2468,6 +2456,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_87-s390x-qcow2-boot.json b/test/data/manifests/rhel_87-s390x-qcow2-boot.json index b034a645f..c3dddbd6e 100644 --- a/test/data/manifests/rhel_87-s390x-qcow2-boot.json +++ b/test/data/manifests/rhel_87-s390x-qcow2-boot.json @@ -2144,12 +2144,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2201,6 +2195,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_87-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_87-s390x-qcow2_customize-boot.json index 929551da5..a7a0119fe 100644 --- a/test/data/manifests/rhel_87-s390x-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_87-s390x-qcow2_customize-boot.json @@ -2401,18 +2401,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2476,6 +2464,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_87-x86_64-ami-boot.json b/test/data/manifests/rhel_87-x86_64-ami-boot.json index 5ade8567e..c8a3f3fd5 100644 --- a/test/data/manifests/rhel_87-x86_64-ami-boot.json +++ b/test/data/manifests/rhel_87-x86_64-ami-boot.json @@ -1826,23 +1826,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2009,6 +1992,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_87-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_87-x86_64-azure_rhui-boot.json index 5e360df96..5d0ec3fe8 100644 --- a/test/data/manifests/rhel_87-x86_64-azure_rhui-boot.json +++ b/test/data/manifests/rhel_87-x86_64-azure_rhui-boot.json @@ -2550,20 +2550,6 @@ "zone": "Etc/UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "systemd-resolved", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2857,6 +2843,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "systemd-resolved", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_87-x86_64-azure_sap_rhui-boot.json b/test/data/manifests/rhel_87-x86_64-azure_sap_rhui-boot.json index 180484108..777fe71da 100644 --- a/test/data/manifests/rhel_87-x86_64-azure_sap_rhui-boot.json +++ b/test/data/manifests/rhel_87-x86_64-azure_sap_rhui-boot.json @@ -3091,20 +3091,6 @@ "zone": "Etc/UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "systemd-resolved", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -3515,6 +3501,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "systemd-resolved", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_87-x86_64-ec2-boot.json b/test/data/manifests/rhel_87-x86_64-ec2-boot.json index 74453fe51..afa4a341e 100644 --- a/test/data/manifests/rhel_87-x86_64-ec2-boot.json +++ b/test/data/manifests/rhel_87-x86_64-ec2-boot.json @@ -1838,23 +1838,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2011,6 +1994,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_87-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_87-x86_64-ec2_ha-boot.json index 691434651..dbecf9063 100644 --- a/test/data/manifests/rhel_87-x86_64-ec2_ha-boot.json +++ b/test/data/manifests/rhel_87-x86_64-ec2_ha-boot.json @@ -2371,23 +2371,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2544,6 +2527,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_87-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_87-x86_64-ec2_sap-boot.json index 1aeb5f20d..321e3b5a8 100644 --- a/test/data/manifests/rhel_87-x86_64-ec2_sap-boot.json +++ b/test/data/manifests/rhel_87-x86_64-ec2_sap-boot.json @@ -3086,23 +3086,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -3376,6 +3359,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_87-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_87-x86_64-edge_commit-boot.json index e72441225..99a04d2e3 100644 --- a/test/data/manifests/rhel_87-x86_64-edge_commit-boot.json +++ b/test/data/manifests/rhel_87-x86_64-edge_commit-boot.json @@ -1873,17 +1873,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1916,6 +1905,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_87-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_87-x86_64-edge_commit_rt-boot.json index db08ff5a4..2b88a10a7 100644 --- a/test/data/manifests/rhel_87-x86_64-edge_commit_rt-boot.json +++ b/test/data/manifests/rhel_87-x86_64-edge_commit_rt-boot.json @@ -1946,17 +1946,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1989,6 +1978,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_87-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_87-x86_64-edge_commit_with_container-boot.json index 58dcdf07a..d2b334f67 100644 --- a/test/data/manifests/rhel_87-x86_64-edge_commit_with_container-boot.json +++ b/test/data/manifests/rhel_87-x86_64-edge_commit_with_container-boot.json @@ -1998,17 +1998,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2041,6 +2030,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_87-x86_64-edge_container-boot.json b/test/data/manifests/rhel_87-x86_64-edge_container-boot.json index cae3052d8..ec16bee07 100644 --- a/test/data/manifests/rhel_87-x86_64-edge_container-boot.json +++ b/test/data/manifests/rhel_87-x86_64-edge_container-boot.json @@ -1863,17 +1863,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1906,6 +1895,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_87-x86_64-gce-boot.json b/test/data/manifests/rhel_87-x86_64-gce-boot.json index 5a042d76b..530d80ff5 100644 --- a/test/data/manifests/rhel_87-x86_64-gce-boot.json +++ b/test/data/manifests/rhel_87-x86_64-gce-boot.json @@ -2010,21 +2010,6 @@ ] } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "rngd", - "dnf-automatic.timer" - ], - "disabled_services": [ - "sshd-keygen@", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.firewall", "options": { @@ -2169,6 +2154,21 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "rngd", + "dnf-automatic.timer" + ], + "disabled_services": [ + "sshd-keygen@", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_87-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_87-x86_64-gce_rhui-boot.json index 40ad543da..9de40e3cf 100644 --- a/test/data/manifests/rhel_87-x86_64-gce_rhui-boot.json +++ b/test/data/manifests/rhel_87-x86_64-gce_rhui-boot.json @@ -2018,21 +2018,6 @@ ] } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "rngd", - "dnf-automatic.timer" - ], - "disabled_services": [ - "sshd-keygen@", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.firewall", "options": { @@ -2180,6 +2165,21 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "rngd", + "dnf-automatic.timer" + ], + "disabled_services": [ + "sshd-keygen@", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_87-x86_64-oci-boot.json b/test/data/manifests/rhel_87-x86_64-oci-boot.json index 08fc07670..b5b906241 100644 --- a/test/data/manifests/rhel_87-x86_64-oci-boot.json +++ b/test/data/manifests/rhel_87-x86_64-oci-boot.json @@ -1986,12 +1986,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2061,6 +2055,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_87-x86_64-qcow2-boot.json b/test/data/manifests/rhel_87-x86_64-qcow2-boot.json index 4657068e2..3d0c73ec2 100644 --- a/test/data/manifests/rhel_87-x86_64-qcow2-boot.json +++ b/test/data/manifests/rhel_87-x86_64-qcow2-boot.json @@ -2007,12 +2007,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2082,6 +2076,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_87-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_87-x86_64-qcow2_customize-boot.json index 1bb50c60e..940d20267 100644 --- a/test/data/manifests/rhel_87-x86_64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_87-x86_64-qcow2_customize-boot.json @@ -2264,18 +2264,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2358,6 +2346,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_87-x86_64-vhd-boot.json b/test/data/manifests/rhel_87-x86_64-vhd-boot.json index 377a26009..3d953b652 100644 --- a/test/data/manifests/rhel_87-x86_64-vhd-boot.json +++ b/test/data/manifests/rhel_87-x86_64-vhd-boot.json @@ -2540,20 +2540,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "systemd-resolved", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2808,6 +2794,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "systemd-resolved", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_88-aarch64-ami-boot.json b/test/data/manifests/rhel_88-aarch64-ami-boot.json index 70f461d66..ea7fc0545 100644 --- a/test/data/manifests/rhel_88-aarch64-ami-boot.json +++ b/test/data/manifests/rhel_88-aarch64-ami-boot.json @@ -1900,23 +1900,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2087,6 +2070,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_88-aarch64-azure_rhui-boot.json b/test/data/manifests/rhel_88-aarch64-azure_rhui-boot.json index f3b313813..253cc2455 100644 --- a/test/data/manifests/rhel_88-aarch64-azure_rhui-boot.json +++ b/test/data/manifests/rhel_88-aarch64-azure_rhui-boot.json @@ -2499,20 +2499,6 @@ "zone": "Etc/UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "systemd-resolved", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2805,6 +2791,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "systemd-resolved", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_88-aarch64-ec2-boot.json b/test/data/manifests/rhel_88-aarch64-ec2-boot.json index 77b787414..9c729ef93 100644 --- a/test/data/manifests/rhel_88-aarch64-ec2-boot.json +++ b/test/data/manifests/rhel_88-aarch64-ec2-boot.json @@ -1910,23 +1910,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2087,6 +2070,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_88-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_88-aarch64-edge_commit-boot.json index 33a92f8d3..3ac3a511a 100644 --- a/test/data/manifests/rhel_88-aarch64-edge_commit-boot.json +++ b/test/data/manifests/rhel_88-aarch64-edge_commit-boot.json @@ -1803,17 +1803,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1846,6 +1835,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_88-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_88-aarch64-edge_commit_with_container-boot.json index 25927f846..9ca51e80b 100644 --- a/test/data/manifests/rhel_88-aarch64-edge_commit_with_container-boot.json +++ b/test/data/manifests/rhel_88-aarch64-edge_commit_with_container-boot.json @@ -1928,17 +1928,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1971,6 +1960,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_88-aarch64-edge_container-boot.json b/test/data/manifests/rhel_88-aarch64-edge_container-boot.json index 2cd55795c..db64289f8 100644 --- a/test/data/manifests/rhel_88-aarch64-edge_container-boot.json +++ b/test/data/manifests/rhel_88-aarch64-edge_container-boot.json @@ -1803,17 +1803,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1846,6 +1835,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_88-aarch64-qcow2-boot.json b/test/data/manifests/rhel_88-aarch64-qcow2-boot.json index 3e5867433..2b20beef7 100644 --- a/test/data/manifests/rhel_88-aarch64-qcow2-boot.json +++ b/test/data/manifests/rhel_88-aarch64-qcow2-boot.json @@ -1980,12 +1980,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2054,6 +2048,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_88-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_88-aarch64-qcow2_customize-boot.json index 425ceb62e..3b58b9d4a 100644 --- a/test/data/manifests/rhel_88-aarch64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_88-aarch64-qcow2_customize-boot.json @@ -2234,18 +2234,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2327,6 +2315,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_88-aarch64-vhd-boot.json b/test/data/manifests/rhel_88-aarch64-vhd-boot.json index 4177fc5dd..9e927dadb 100644 --- a/test/data/manifests/rhel_88-aarch64-vhd-boot.json +++ b/test/data/manifests/rhel_88-aarch64-vhd-boot.json @@ -2489,20 +2489,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "systemd-resolved", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2756,6 +2742,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "systemd-resolved", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_88-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_88-ppc64le-qcow2-boot.json index 157dd7213..f7d123128 100644 --- a/test/data/manifests/rhel_88-ppc64le-qcow2-boot.json +++ b/test/data/manifests/rhel_88-ppc64le-qcow2-boot.json @@ -2130,12 +2130,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2195,6 +2189,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_88-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_88-ppc64le-qcow2_customize-boot.json index bdcb4b0bd..cbe9530b1 100644 --- a/test/data/manifests/rhel_88-ppc64le-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_88-ppc64le-qcow2_customize-boot.json @@ -2384,18 +2384,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2468,6 +2456,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_88-s390x-qcow2-boot.json b/test/data/manifests/rhel_88-s390x-qcow2-boot.json index c99dff5ac..9743e4435 100644 --- a/test/data/manifests/rhel_88-s390x-qcow2-boot.json +++ b/test/data/manifests/rhel_88-s390x-qcow2-boot.json @@ -2144,12 +2144,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2201,6 +2195,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_88-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_88-s390x-qcow2_customize-boot.json index dfc9ad792..4a72254df 100644 --- a/test/data/manifests/rhel_88-s390x-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_88-s390x-qcow2_customize-boot.json @@ -2401,18 +2401,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2476,6 +2464,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_88-x86_64-ami-boot.json b/test/data/manifests/rhel_88-x86_64-ami-boot.json index 8a05cfb9e..4cd2dbd65 100644 --- a/test/data/manifests/rhel_88-x86_64-ami-boot.json +++ b/test/data/manifests/rhel_88-x86_64-ami-boot.json @@ -1826,23 +1826,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2009,6 +1992,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_88-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_88-x86_64-azure_rhui-boot.json index 5488493e5..a00322c3e 100644 --- a/test/data/manifests/rhel_88-x86_64-azure_rhui-boot.json +++ b/test/data/manifests/rhel_88-x86_64-azure_rhui-boot.json @@ -2550,20 +2550,6 @@ "zone": "Etc/UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "systemd-resolved", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2857,6 +2843,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "systemd-resolved", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_88-x86_64-azure_sap_rhui-boot.json b/test/data/manifests/rhel_88-x86_64-azure_sap_rhui-boot.json index 0afab9c9d..0187c185c 100644 --- a/test/data/manifests/rhel_88-x86_64-azure_sap_rhui-boot.json +++ b/test/data/manifests/rhel_88-x86_64-azure_sap_rhui-boot.json @@ -3091,20 +3091,6 @@ "zone": "Etc/UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "systemd-resolved", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -3515,6 +3501,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "systemd-resolved", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_88-x86_64-ec2-boot.json b/test/data/manifests/rhel_88-x86_64-ec2-boot.json index f35e64a8e..62cf74d73 100644 --- a/test/data/manifests/rhel_88-x86_64-ec2-boot.json +++ b/test/data/manifests/rhel_88-x86_64-ec2-boot.json @@ -1838,23 +1838,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2011,6 +1994,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_88-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_88-x86_64-ec2_ha-boot.json index fbf8b4b31..31866b918 100644 --- a/test/data/manifests/rhel_88-x86_64-ec2_ha-boot.json +++ b/test/data/manifests/rhel_88-x86_64-ec2_ha-boot.json @@ -2371,23 +2371,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2544,6 +2527,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_88-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_88-x86_64-ec2_sap-boot.json index 815e68c91..b6f88e3fc 100644 --- a/test/data/manifests/rhel_88-x86_64-ec2_sap-boot.json +++ b/test/data/manifests/rhel_88-x86_64-ec2_sap-boot.json @@ -3086,23 +3086,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -3376,6 +3359,23 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_88-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_88-x86_64-edge_commit-boot.json index 17b9ef7f9..e18656cb9 100644 --- a/test/data/manifests/rhel_88-x86_64-edge_commit-boot.json +++ b/test/data/manifests/rhel_88-x86_64-edge_commit-boot.json @@ -1873,17 +1873,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1916,6 +1905,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_88-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_88-x86_64-edge_commit_rt-boot.json index a6884adf4..badc9272c 100644 --- a/test/data/manifests/rhel_88-x86_64-edge_commit_rt-boot.json +++ b/test/data/manifests/rhel_88-x86_64-edge_commit_rt-boot.json @@ -1943,17 +1943,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1986,6 +1975,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_88-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_88-x86_64-edge_commit_with_container-boot.json index 0db322ebc..df26cad08 100644 --- a/test/data/manifests/rhel_88-x86_64-edge_commit_with_container-boot.json +++ b/test/data/manifests/rhel_88-x86_64-edge_commit_with_container-boot.json @@ -1998,17 +1998,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2041,6 +2030,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_88-x86_64-edge_container-boot.json b/test/data/manifests/rhel_88-x86_64-edge_container-boot.json index 306252c7c..d9135f445 100644 --- a/test/data/manifests/rhel_88-x86_64-edge_container-boot.json +++ b/test/data/manifests/rhel_88-x86_64-edge_container-boot.json @@ -1863,17 +1863,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1906,6 +1895,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_88-x86_64-gce-boot.json b/test/data/manifests/rhel_88-x86_64-gce-boot.json index 30d19b18e..e75066f2e 100644 --- a/test/data/manifests/rhel_88-x86_64-gce-boot.json +++ b/test/data/manifests/rhel_88-x86_64-gce-boot.json @@ -2010,21 +2010,6 @@ ] } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "rngd", - "dnf-automatic.timer" - ], - "disabled_services": [ - "sshd-keygen@", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.firewall", "options": { @@ -2169,6 +2154,21 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "rngd", + "dnf-automatic.timer" + ], + "disabled_services": [ + "sshd-keygen@", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_88-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_88-x86_64-gce_rhui-boot.json index 6241d5121..7f324e279 100644 --- a/test/data/manifests/rhel_88-x86_64-gce_rhui-boot.json +++ b/test/data/manifests/rhel_88-x86_64-gce_rhui-boot.json @@ -2018,21 +2018,6 @@ ] } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "rngd", - "dnf-automatic.timer" - ], - "disabled_services": [ - "sshd-keygen@", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.firewall", "options": { @@ -2180,6 +2165,21 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "rngd", + "dnf-automatic.timer" + ], + "disabled_services": [ + "sshd-keygen@", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_88-x86_64-oci-boot.json b/test/data/manifests/rhel_88-x86_64-oci-boot.json index ab1dbefec..b4b3ca970 100644 --- a/test/data/manifests/rhel_88-x86_64-oci-boot.json +++ b/test/data/manifests/rhel_88-x86_64-oci-boot.json @@ -1986,12 +1986,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2061,6 +2055,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_88-x86_64-qcow2-boot.json b/test/data/manifests/rhel_88-x86_64-qcow2-boot.json index d7cf83a5c..6e14a61b9 100644 --- a/test/data/manifests/rhel_88-x86_64-qcow2-boot.json +++ b/test/data/manifests/rhel_88-x86_64-qcow2-boot.json @@ -2007,12 +2007,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2082,6 +2076,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_88-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_88-x86_64-qcow2_customize-boot.json index 03b3d7fd5..7033192da 100644 --- a/test/data/manifests/rhel_88-x86_64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_88-x86_64-qcow2_customize-boot.json @@ -2264,18 +2264,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2358,6 +2346,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_88-x86_64-vhd-boot.json b/test/data/manifests/rhel_88-x86_64-vhd-boot.json index d0b408869..9519d7b01 100644 --- a/test/data/manifests/rhel_88-x86_64-vhd-boot.json +++ b/test/data/manifests/rhel_88-x86_64-vhd-boot.json @@ -2540,20 +2540,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "systemd-resolved", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2808,6 +2794,20 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "systemd-resolved", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_9-aarch64-ami-boot.json b/test/data/manifests/rhel_9-aarch64-ami-boot.json index 3fce22cc9..0b0a5dc4d 100644 --- a/test/data/manifests/rhel_9-aarch64-ami-boot.json +++ b/test/data/manifests/rhel_9-aarch64-ami-boot.json @@ -4431,24 +4431,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target", - "tuned" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4620,6 +4602,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target", + "tuned" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_9-aarch64-azure_rhui-boot.json b/test/data/manifests/rhel_9-aarch64-azure_rhui-boot.json index 8008aa762..8864a8d68 100644 --- a/test/data/manifests/rhel_9-aarch64-azure_rhui-boot.json +++ b/test/data/manifests/rhel_9-aarch64-azure_rhui-boot.json @@ -6097,19 +6097,6 @@ "zone": "Etc/UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -6379,6 +6366,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_9-aarch64-ec2-boot.json b/test/data/manifests/rhel_9-aarch64-ec2-boot.json index ba4e156ef..37b27fa31 100644 --- a/test/data/manifests/rhel_9-aarch64-ec2-boot.json +++ b/test/data/manifests/rhel_9-aarch64-ec2-boot.json @@ -4474,24 +4474,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target", - "tuned" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4653,6 +4635,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target", + "tuned" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_9-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_9-aarch64-edge_commit-boot.json index d0f917882..b08178270 100644 --- a/test/data/manifests/rhel_9-aarch64-edge_commit-boot.json +++ b/test/data/manifests/rhel_9-aarch64-edge_commit-boot.json @@ -4551,17 +4551,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4594,6 +4583,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_9-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_9-aarch64-edge_commit_with_container-boot.json index ca0b8fc44..2ab515c4b 100644 --- a/test/data/manifests/rhel_9-aarch64-edge_commit_with_container-boot.json +++ b/test/data/manifests/rhel_9-aarch64-edge_commit_with_container-boot.json @@ -4600,17 +4600,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4643,6 +4632,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_9-aarch64-edge_container-boot.json b/test/data/manifests/rhel_9-aarch64-edge_container-boot.json index fb8ef274f..86fad3945 100644 --- a/test/data/manifests/rhel_9-aarch64-edge_container-boot.json +++ b/test/data/manifests/rhel_9-aarch64-edge_container-boot.json @@ -4551,17 +4551,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4594,6 +4583,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_9-aarch64-qcow2-boot.json b/test/data/manifests/rhel_9-aarch64-qcow2-boot.json index 4740d9640..17dd2fa76 100644 --- a/test/data/manifests/rhel_9-aarch64-qcow2-boot.json +++ b/test/data/manifests/rhel_9-aarch64-qcow2-boot.json @@ -4642,12 +4642,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4724,6 +4718,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_9-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_9-aarch64-qcow2_customize-boot.json index 94c69d92e..e54a273ee 100644 --- a/test/data/manifests/rhel_9-aarch64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_9-aarch64-qcow2_customize-boot.json @@ -4959,18 +4959,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5053,6 +5041,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_9-aarch64-vhd-boot.json b/test/data/manifests/rhel_9-aarch64-vhd-boot.json index 8a7b81dda..45aa46d21 100644 --- a/test/data/manifests/rhel_9-aarch64-vhd-boot.json +++ b/test/data/manifests/rhel_9-aarch64-vhd-boot.json @@ -6048,19 +6048,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -6298,6 +6285,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_9-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_9-ppc64le-qcow2-boot.json index 80aea7b5a..528289742 100644 --- a/test/data/manifests/rhel_9-ppc64le-qcow2-boot.json +++ b/test/data/manifests/rhel_9-ppc64le-qcow2-boot.json @@ -5266,12 +5266,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5338,6 +5332,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_9-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_9-ppc64le-qcow2_customize-boot.json index c044a285b..25d84b5cf 100644 --- a/test/data/manifests/rhel_9-ppc64le-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_9-ppc64le-qcow2_customize-boot.json @@ -5567,18 +5567,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5651,6 +5639,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_9-s390x-qcow2-boot.json b/test/data/manifests/rhel_9-s390x-qcow2-boot.json index 096811c77..d977de2ff 100644 --- a/test/data/manifests/rhel_9-s390x-qcow2-boot.json +++ b/test/data/manifests/rhel_9-s390x-qcow2-boot.json @@ -5499,12 +5499,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5562,6 +5556,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_9-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_9-s390x-qcow2_customize-boot.json index ae5b2c7d7..53f33575a 100644 --- a/test/data/manifests/rhel_9-s390x-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_9-s390x-qcow2_customize-boot.json @@ -5808,18 +5808,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5883,6 +5871,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_9-x86_64-ami-boot.json b/test/data/manifests/rhel_9-x86_64-ami-boot.json index 461df358f..4fb64eaf3 100644 --- a/test/data/manifests/rhel_9-x86_64-ami-boot.json +++ b/test/data/manifests/rhel_9-x86_64-ami-boot.json @@ -4383,24 +4383,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target", - "tuned" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4581,6 +4563,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target", + "tuned" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_9-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_9-x86_64-azure_rhui-boot.json index 2a1f5d022..392c0d1fb 100644 --- a/test/data/manifests/rhel_9-x86_64-azure_rhui-boot.json +++ b/test/data/manifests/rhel_9-x86_64-azure_rhui-boot.json @@ -6377,19 +6377,6 @@ "zone": "Etc/UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -6660,6 +6647,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_9-x86_64-ec2-boot.json b/test/data/manifests/rhel_9-x86_64-ec2-boot.json index 089da986d..75d758394 100644 --- a/test/data/manifests/rhel_9-x86_64-ec2-boot.json +++ b/test/data/manifests/rhel_9-x86_64-ec2-boot.json @@ -4428,24 +4428,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target", - "tuned" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4616,6 +4598,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target", + "tuned" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_9-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_9-x86_64-ec2_ha-boot.json index a8e7c1abc..9a74c230d 100644 --- a/test/data/manifests/rhel_9-x86_64-ec2_ha-boot.json +++ b/test/data/manifests/rhel_9-x86_64-ec2_ha-boot.json @@ -5872,24 +5872,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target", - "tuned" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -6060,6 +6042,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target", + "tuned" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_9-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_9-x86_64-ec2_sap-boot.json index 335a5b9b7..79fec17e3 100644 --- a/test/data/manifests/rhel_9-x86_64-ec2_sap-boot.json +++ b/test/data/manifests/rhel_9-x86_64-ec2_sap-boot.json @@ -8310,24 +8310,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target", - "tuned" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -8615,6 +8597,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target", + "tuned" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_9-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_9-x86_64-edge_commit-boot.json index 9b30f75d5..05dc77a7c 100644 --- a/test/data/manifests/rhel_9-x86_64-edge_commit-boot.json +++ b/test/data/manifests/rhel_9-x86_64-edge_commit-boot.json @@ -4762,17 +4762,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4805,6 +4794,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_9-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_9-x86_64-edge_commit_rt-boot.json index 420b8c7d7..1c1147640 100644 --- a/test/data/manifests/rhel_9-x86_64-edge_commit_rt-boot.json +++ b/test/data/manifests/rhel_9-x86_64-edge_commit_rt-boot.json @@ -5145,17 +5145,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5188,6 +5177,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_9-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_9-x86_64-edge_commit_with_container-boot.json index 155818096..5eb599741 100644 --- a/test/data/manifests/rhel_9-x86_64-edge_commit_with_container-boot.json +++ b/test/data/manifests/rhel_9-x86_64-edge_commit_with_container-boot.json @@ -4811,17 +4811,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4854,6 +4843,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_9-x86_64-edge_container-boot.json b/test/data/manifests/rhel_9-x86_64-edge_container-boot.json index e6591329a..0af79977f 100644 --- a/test/data/manifests/rhel_9-x86_64-edge_container-boot.json +++ b/test/data/manifests/rhel_9-x86_64-edge_container-boot.json @@ -4751,17 +4751,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4794,6 +4783,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_9-x86_64-gce-boot.json b/test/data/manifests/rhel_9-x86_64-gce-boot.json index 6c134c775..8812df796 100644 --- a/test/data/manifests/rhel_9-x86_64-gce-boot.json +++ b/test/data/manifests/rhel_9-x86_64-gce-boot.json @@ -4675,21 +4675,6 @@ ] } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "rngd", - "dnf-automatic.timer" - ], - "disabled_services": [ - "sshd-keygen@", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.firewall", "options": { @@ -4842,6 +4827,21 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "rngd", + "dnf-automatic.timer" + ], + "disabled_services": [ + "sshd-keygen@", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_9-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_9-x86_64-gce_rhui-boot.json index a6206bef2..3bb3ee4e6 100644 --- a/test/data/manifests/rhel_9-x86_64-gce_rhui-boot.json +++ b/test/data/manifests/rhel_9-x86_64-gce_rhui-boot.json @@ -4678,21 +4678,6 @@ ] } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "rngd", - "dnf-automatic.timer" - ], - "disabled_services": [ - "sshd-keygen@", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.firewall", "options": { @@ -4848,6 +4833,21 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "rngd", + "dnf-automatic.timer" + ], + "disabled_services": [ + "sshd-keygen@", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_9-x86_64-oci-boot.json b/test/data/manifests/rhel_9-x86_64-oci-boot.json index a57abdb06..b1fc02d8c 100644 --- a/test/data/manifests/rhel_9-x86_64-oci-boot.json +++ b/test/data/manifests/rhel_9-x86_64-oci-boot.json @@ -4877,12 +4877,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4960,6 +4954,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_9-x86_64-qcow2-boot.json b/test/data/manifests/rhel_9-x86_64-qcow2-boot.json index 237498dd4..8f97309e9 100644 --- a/test/data/manifests/rhel_9-x86_64-qcow2-boot.json +++ b/test/data/manifests/rhel_9-x86_64-qcow2-boot.json @@ -4898,12 +4898,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4981,6 +4975,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_9-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_9-x86_64-qcow2_customize-boot.json index 76c1c85bc..49dd02671 100644 --- a/test/data/manifests/rhel_9-x86_64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_9-x86_64-qcow2_customize-boot.json @@ -5295,18 +5295,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5390,6 +5378,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_9-x86_64-vhd-boot.json b/test/data/manifests/rhel_9-x86_64-vhd-boot.json index 33aa691d8..00295989d 100644 --- a/test/data/manifests/rhel_9-x86_64-vhd-boot.json +++ b/test/data/manifests/rhel_9-x86_64-vhd-boot.json @@ -6344,19 +6344,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -6595,6 +6582,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_90-aarch64-ami-boot.json b/test/data/manifests/rhel_90-aarch64-ami-boot.json index 6fadaa1fe..c0f46b674 100644 --- a/test/data/manifests/rhel_90-aarch64-ami-boot.json +++ b/test/data/manifests/rhel_90-aarch64-ami-boot.json @@ -1736,24 +1736,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target", - "tuned" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1925,6 +1907,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target", + "tuned" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_90-aarch64-azure_rhui-boot.json b/test/data/manifests/rhel_90-aarch64-azure_rhui-boot.json index c9f6fa8bc..358b5f207 100644 --- a/test/data/manifests/rhel_90-aarch64-azure_rhui-boot.json +++ b/test/data/manifests/rhel_90-aarch64-azure_rhui-boot.json @@ -2335,19 +2335,6 @@ "zone": "Etc/UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2617,6 +2604,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_90-aarch64-ec2-boot.json b/test/data/manifests/rhel_90-aarch64-ec2-boot.json index baad05706..f0f8f057c 100644 --- a/test/data/manifests/rhel_90-aarch64-ec2-boot.json +++ b/test/data/manifests/rhel_90-aarch64-ec2-boot.json @@ -1752,24 +1752,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target", - "tuned" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1944,6 +1926,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target", + "tuned" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_90-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_90-aarch64-edge_commit-boot.json index cdbd16c18..2170f13fd 100644 --- a/test/data/manifests/rhel_90-aarch64-edge_commit-boot.json +++ b/test/data/manifests/rhel_90-aarch64-edge_commit-boot.json @@ -1689,17 +1689,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1732,6 +1721,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_90-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_90-aarch64-edge_commit_with_container-boot.json index 53b4a6491..0daa7ef02 100644 --- a/test/data/manifests/rhel_90-aarch64-edge_commit_with_container-boot.json +++ b/test/data/manifests/rhel_90-aarch64-edge_commit_with_container-boot.json @@ -1802,17 +1802,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1845,6 +1834,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_90-aarch64-edge_container-boot.json b/test/data/manifests/rhel_90-aarch64-edge_container-boot.json index db69b62a6..af11f90ab 100644 --- a/test/data/manifests/rhel_90-aarch64-edge_container-boot.json +++ b/test/data/manifests/rhel_90-aarch64-edge_container-boot.json @@ -1689,17 +1689,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1732,6 +1721,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_90-aarch64-qcow2-boot.json b/test/data/manifests/rhel_90-aarch64-qcow2-boot.json index 54fa2c31b..e89ae4c61 100644 --- a/test/data/manifests/rhel_90-aarch64-qcow2-boot.json +++ b/test/data/manifests/rhel_90-aarch64-qcow2-boot.json @@ -1800,12 +1800,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1882,6 +1876,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json index af0b16e3a..35e831539 100644 --- a/test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json @@ -1989,18 +1989,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2083,6 +2071,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_90-aarch64-vhd-boot.json b/test/data/manifests/rhel_90-aarch64-vhd-boot.json index 4cb09167a..5d6532efc 100644 --- a/test/data/manifests/rhel_90-aarch64-vhd-boot.json +++ b/test/data/manifests/rhel_90-aarch64-vhd-boot.json @@ -2321,19 +2321,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2571,6 +2558,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json index 39153e002..5b1924460 100644 --- a/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json +++ b/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json @@ -2037,12 +2037,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2109,6 +2103,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_90-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_90-ppc64le-qcow2_customize-boot.json index 02271626a..c9e108dbe 100644 --- a/test/data/manifests/rhel_90-ppc64le-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_90-ppc64le-qcow2_customize-boot.json @@ -2220,18 +2220,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2304,6 +2292,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_90-s390x-qcow2-boot.json b/test/data/manifests/rhel_90-s390x-qcow2-boot.json index 9c7e6efbe..517f7d7b6 100644 --- a/test/data/manifests/rhel_90-s390x-qcow2-boot.json +++ b/test/data/manifests/rhel_90-s390x-qcow2-boot.json @@ -2116,12 +2116,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2179,6 +2173,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_90-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_90-s390x-qcow2_customize-boot.json index 938340eb4..9d303c17d 100644 --- a/test/data/manifests/rhel_90-s390x-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_90-s390x-qcow2_customize-boot.json @@ -2302,18 +2302,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2377,6 +2365,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_90-x86_64-ami-boot.json b/test/data/manifests/rhel_90-x86_64-ami-boot.json index e17f90729..9d6e67338 100644 --- a/test/data/manifests/rhel_90-x86_64-ami-boot.json +++ b/test/data/manifests/rhel_90-x86_64-ami-boot.json @@ -1727,24 +1727,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target", - "tuned" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1925,6 +1907,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target", + "tuned" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_90-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_90-x86_64-azure_rhui-boot.json index 5834398af..e5e694ac5 100644 --- a/test/data/manifests/rhel_90-x86_64-azure_rhui-boot.json +++ b/test/data/manifests/rhel_90-x86_64-azure_rhui-boot.json @@ -2443,19 +2443,6 @@ "zone": "Etc/UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2726,6 +2713,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_90-x86_64-ec2-boot.json b/test/data/manifests/rhel_90-x86_64-ec2-boot.json index 8e488efdf..a83046744 100644 --- a/test/data/manifests/rhel_90-x86_64-ec2-boot.json +++ b/test/data/manifests/rhel_90-x86_64-ec2-boot.json @@ -1745,24 +1745,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target", - "tuned" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1946,6 +1928,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target", + "tuned" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_90-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_90-x86_64-ec2_ha-boot.json index d1abc6f2e..1710938d1 100644 --- a/test/data/manifests/rhel_90-x86_64-ec2_ha-boot.json +++ b/test/data/manifests/rhel_90-x86_64-ec2_ha-boot.json @@ -2317,24 +2317,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target", - "tuned" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2518,6 +2500,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target", + "tuned" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_90-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_90-x86_64-ec2_sap-boot.json index e252fda59..beb20f4c0 100644 --- a/test/data/manifests/rhel_90-x86_64-ec2_sap-boot.json +++ b/test/data/manifests/rhel_90-x86_64-ec2_sap-boot.json @@ -3120,24 +3120,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target", - "tuned" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -3438,6 +3420,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target", + "tuned" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_90-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_90-x86_64-edge_commit-boot.json index c927d9d46..41948e073 100644 --- a/test/data/manifests/rhel_90-x86_64-edge_commit-boot.json +++ b/test/data/manifests/rhel_90-x86_64-edge_commit-boot.json @@ -1777,17 +1777,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1820,6 +1809,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_90-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_90-x86_64-edge_commit_rt-boot.json index 7235006b3..3f0eaf599 100644 --- a/test/data/manifests/rhel_90-x86_64-edge_commit_rt-boot.json +++ b/test/data/manifests/rhel_90-x86_64-edge_commit_rt-boot.json @@ -1925,17 +1925,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1968,6 +1957,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_90-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_90-x86_64-edge_commit_with_container-boot.json index 36eeabff0..8d141c74a 100644 --- a/test/data/manifests/rhel_90-x86_64-edge_commit_with_container-boot.json +++ b/test/data/manifests/rhel_90-x86_64-edge_commit_with_container-boot.json @@ -1890,17 +1890,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1933,6 +1922,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_90-x86_64-edge_container-boot.json b/test/data/manifests/rhel_90-x86_64-edge_container-boot.json index ad8c434ef..6a66125c6 100644 --- a/test/data/manifests/rhel_90-x86_64-edge_container-boot.json +++ b/test/data/manifests/rhel_90-x86_64-edge_container-boot.json @@ -1767,17 +1767,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1810,6 +1799,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_90-x86_64-gce-boot.json b/test/data/manifests/rhel_90-x86_64-gce-boot.json index e1ca568dc..b4bba62cf 100644 --- a/test/data/manifests/rhel_90-x86_64-gce-boot.json +++ b/test/data/manifests/rhel_90-x86_64-gce-boot.json @@ -1845,21 +1845,6 @@ ] } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "rngd", - "dnf-automatic.timer" - ], - "disabled_services": [ - "sshd-keygen@", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.firewall", "options": { @@ -2012,6 +1997,21 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "rngd", + "dnf-automatic.timer" + ], + "disabled_services": [ + "sshd-keygen@", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_90-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_90-x86_64-gce_rhui-boot.json index f8973414e..7c0cb1cb0 100644 --- a/test/data/manifests/rhel_90-x86_64-gce_rhui-boot.json +++ b/test/data/manifests/rhel_90-x86_64-gce_rhui-boot.json @@ -1848,21 +1848,6 @@ ] } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "rngd", - "dnf-automatic.timer" - ], - "disabled_services": [ - "sshd-keygen@", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.firewall", "options": { @@ -2018,6 +2003,21 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "rngd", + "dnf-automatic.timer" + ], + "disabled_services": [ + "sshd-keygen@", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_90-x86_64-oci-boot.json b/test/data/manifests/rhel_90-x86_64-oci-boot.json index 005daf34d..cd9b86a52 100644 --- a/test/data/manifests/rhel_90-x86_64-oci-boot.json +++ b/test/data/manifests/rhel_90-x86_64-oci-boot.json @@ -1881,12 +1881,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1964,6 +1958,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_90-x86_64-qcow2-boot.json b/test/data/manifests/rhel_90-x86_64-qcow2-boot.json index 8aa58ac6b..7f0cf0a13 100644 --- a/test/data/manifests/rhel_90-x86_64-qcow2-boot.json +++ b/test/data/manifests/rhel_90-x86_64-qcow2-boot.json @@ -1902,12 +1902,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -1985,6 +1979,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_90-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_90-x86_64-qcow2_customize-boot.json index dd05d7e32..d3baac846 100644 --- a/test/data/manifests/rhel_90-x86_64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_90-x86_64-qcow2_customize-boot.json @@ -2121,18 +2121,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2216,6 +2204,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_90-x86_64-vhd-boot.json b/test/data/manifests/rhel_90-x86_64-vhd-boot.json index 1970bb749..79f1dd566 100644 --- a/test/data/manifests/rhel_90-x86_64-vhd-boot.json +++ b/test/data/manifests/rhel_90-x86_64-vhd-boot.json @@ -2435,19 +2435,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -2686,6 +2673,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_91-aarch64-ami-boot.json b/test/data/manifests/rhel_91-aarch64-ami-boot.json index d9a311db5..743e64cf3 100644 --- a/test/data/manifests/rhel_91-aarch64-ami-boot.json +++ b/test/data/manifests/rhel_91-aarch64-ami-boot.json @@ -4431,24 +4431,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target", - "tuned" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4620,6 +4602,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target", + "tuned" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_91-aarch64-azure_rhui-boot.json b/test/data/manifests/rhel_91-aarch64-azure_rhui-boot.json index 40d62f212..66c8a1109 100644 --- a/test/data/manifests/rhel_91-aarch64-azure_rhui-boot.json +++ b/test/data/manifests/rhel_91-aarch64-azure_rhui-boot.json @@ -6097,19 +6097,6 @@ "zone": "Etc/UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -6379,6 +6366,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_91-aarch64-ec2-boot.json b/test/data/manifests/rhel_91-aarch64-ec2-boot.json index 11f37be0f..8886d931d 100644 --- a/test/data/manifests/rhel_91-aarch64-ec2-boot.json +++ b/test/data/manifests/rhel_91-aarch64-ec2-boot.json @@ -4474,24 +4474,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target", - "tuned" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4653,6 +4635,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target", + "tuned" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_91-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_91-aarch64-edge_commit-boot.json index 64e056e0e..a06367bf4 100644 --- a/test/data/manifests/rhel_91-aarch64-edge_commit-boot.json +++ b/test/data/manifests/rhel_91-aarch64-edge_commit-boot.json @@ -4551,17 +4551,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4594,6 +4583,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_91-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_91-aarch64-edge_commit_with_container-boot.json index ad13b9866..c53ca9fe3 100644 --- a/test/data/manifests/rhel_91-aarch64-edge_commit_with_container-boot.json +++ b/test/data/manifests/rhel_91-aarch64-edge_commit_with_container-boot.json @@ -4600,17 +4600,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4643,6 +4632,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_91-aarch64-edge_container-boot.json b/test/data/manifests/rhel_91-aarch64-edge_container-boot.json index 2e29c2669..54c174079 100644 --- a/test/data/manifests/rhel_91-aarch64-edge_container-boot.json +++ b/test/data/manifests/rhel_91-aarch64-edge_container-boot.json @@ -4551,17 +4551,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4594,6 +4583,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_91-aarch64-qcow2-boot.json b/test/data/manifests/rhel_91-aarch64-qcow2-boot.json index bf4f10b59..eb6a5f423 100644 --- a/test/data/manifests/rhel_91-aarch64-qcow2-boot.json +++ b/test/data/manifests/rhel_91-aarch64-qcow2-boot.json @@ -4642,12 +4642,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4724,6 +4718,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_91-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_91-aarch64-qcow2_customize-boot.json index 7b51eab4c..b27de134e 100644 --- a/test/data/manifests/rhel_91-aarch64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_91-aarch64-qcow2_customize-boot.json @@ -5232,18 +5232,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5326,6 +5314,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_91-aarch64-vhd-boot.json b/test/data/manifests/rhel_91-aarch64-vhd-boot.json index bf5f230f8..8c5eaf4c0 100644 --- a/test/data/manifests/rhel_91-aarch64-vhd-boot.json +++ b/test/data/manifests/rhel_91-aarch64-vhd-boot.json @@ -6048,19 +6048,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -6298,6 +6285,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_91-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_91-ppc64le-qcow2-boot.json index 5588de70a..7e6139d8c 100644 --- a/test/data/manifests/rhel_91-ppc64le-qcow2-boot.json +++ b/test/data/manifests/rhel_91-ppc64le-qcow2-boot.json @@ -5266,12 +5266,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5338,6 +5332,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_91-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_91-ppc64le-qcow2_customize-boot.json index 525a14be9..cb1b5f0c4 100644 --- a/test/data/manifests/rhel_91-ppc64le-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_91-ppc64le-qcow2_customize-boot.json @@ -5840,18 +5840,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5924,6 +5912,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_91-s390x-qcow2-boot.json b/test/data/manifests/rhel_91-s390x-qcow2-boot.json index b1335bd7e..fb7449306 100644 --- a/test/data/manifests/rhel_91-s390x-qcow2-boot.json +++ b/test/data/manifests/rhel_91-s390x-qcow2-boot.json @@ -5499,12 +5499,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5562,6 +5556,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_91-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_91-s390x-qcow2_customize-boot.json index 2a4644f8a..8bc80d0e5 100644 --- a/test/data/manifests/rhel_91-s390x-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_91-s390x-qcow2_customize-boot.json @@ -6064,18 +6064,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -6139,6 +6127,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_91-x86_64-ami-boot.json b/test/data/manifests/rhel_91-x86_64-ami-boot.json index 3c83b640d..7d69040ee 100644 --- a/test/data/manifests/rhel_91-x86_64-ami-boot.json +++ b/test/data/manifests/rhel_91-x86_64-ami-boot.json @@ -4383,24 +4383,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target", - "tuned" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4581,6 +4563,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target", + "tuned" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_91-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_91-x86_64-azure_rhui-boot.json index e06c57d90..16480f83b 100644 --- a/test/data/manifests/rhel_91-x86_64-azure_rhui-boot.json +++ b/test/data/manifests/rhel_91-x86_64-azure_rhui-boot.json @@ -6377,19 +6377,6 @@ "zone": "Etc/UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -6660,6 +6647,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_91-x86_64-ec2-boot.json b/test/data/manifests/rhel_91-x86_64-ec2-boot.json index ccb0a640f..52eac0ebb 100644 --- a/test/data/manifests/rhel_91-x86_64-ec2-boot.json +++ b/test/data/manifests/rhel_91-x86_64-ec2-boot.json @@ -4428,24 +4428,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target", - "tuned" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4616,6 +4598,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target", + "tuned" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_91-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_91-x86_64-ec2_ha-boot.json index 484a6610e..38e0639db 100644 --- a/test/data/manifests/rhel_91-x86_64-ec2_ha-boot.json +++ b/test/data/manifests/rhel_91-x86_64-ec2_ha-boot.json @@ -5872,24 +5872,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target", - "tuned" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -6060,6 +6042,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target", + "tuned" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_91-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_91-x86_64-ec2_sap-boot.json index 6b979b97e..ef87883ee 100644 --- a/test/data/manifests/rhel_91-x86_64-ec2_sap-boot.json +++ b/test/data/manifests/rhel_91-x86_64-ec2_sap-boot.json @@ -8310,24 +8310,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target", - "tuned" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -8615,6 +8597,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target", + "tuned" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_91-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_91-x86_64-edge_commit-boot.json index 29167d014..e74b43c62 100644 --- a/test/data/manifests/rhel_91-x86_64-edge_commit-boot.json +++ b/test/data/manifests/rhel_91-x86_64-edge_commit-boot.json @@ -4762,17 +4762,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4805,6 +4794,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_91-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_91-x86_64-edge_commit_rt-boot.json index 7c1a80521..ca38cf046 100644 --- a/test/data/manifests/rhel_91-x86_64-edge_commit_rt-boot.json +++ b/test/data/manifests/rhel_91-x86_64-edge_commit_rt-boot.json @@ -5145,17 +5145,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5188,6 +5177,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_91-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_91-x86_64-edge_commit_with_container-boot.json index 4d959e85f..8e8c8d202 100644 --- a/test/data/manifests/rhel_91-x86_64-edge_commit_with_container-boot.json +++ b/test/data/manifests/rhel_91-x86_64-edge_commit_with_container-boot.json @@ -4811,17 +4811,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4854,6 +4843,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_91-x86_64-edge_container-boot.json b/test/data/manifests/rhel_91-x86_64-edge_container-boot.json index 8c34033d0..a91317c4f 100644 --- a/test/data/manifests/rhel_91-x86_64-edge_container-boot.json +++ b/test/data/manifests/rhel_91-x86_64-edge_container-boot.json @@ -4751,17 +4751,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4794,6 +4783,17 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_91-x86_64-gce-boot.json b/test/data/manifests/rhel_91-x86_64-gce-boot.json index f4ef18c70..4edde03f5 100644 --- a/test/data/manifests/rhel_91-x86_64-gce-boot.json +++ b/test/data/manifests/rhel_91-x86_64-gce-boot.json @@ -4675,21 +4675,6 @@ ] } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "rngd", - "dnf-automatic.timer" - ], - "disabled_services": [ - "sshd-keygen@", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.firewall", "options": { @@ -4842,6 +4827,21 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "rngd", + "dnf-automatic.timer" + ], + "disabled_services": [ + "sshd-keygen@", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_91-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_91-x86_64-gce_rhui-boot.json index debaa125b..86818aa73 100644 --- a/test/data/manifests/rhel_91-x86_64-gce_rhui-boot.json +++ b/test/data/manifests/rhel_91-x86_64-gce_rhui-boot.json @@ -4678,21 +4678,6 @@ ] } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "rngd", - "dnf-automatic.timer" - ], - "disabled_services": [ - "sshd-keygen@", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.firewall", "options": { @@ -4848,6 +4833,21 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "rngd", + "dnf-automatic.timer" + ], + "disabled_services": [ + "sshd-keygen@", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_91-x86_64-oci-boot.json b/test/data/manifests/rhel_91-x86_64-oci-boot.json index fc9330658..edd12c549 100644 --- a/test/data/manifests/rhel_91-x86_64-oci-boot.json +++ b/test/data/manifests/rhel_91-x86_64-oci-boot.json @@ -4877,12 +4877,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4960,6 +4954,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_91-x86_64-qcow2-boot.json b/test/data/manifests/rhel_91-x86_64-qcow2-boot.json index e1962b6bf..ec8199c2a 100644 --- a/test/data/manifests/rhel_91-x86_64-qcow2-boot.json +++ b/test/data/manifests/rhel_91-x86_64-qcow2-boot.json @@ -4898,12 +4898,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4981,6 +4975,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_91-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_91-x86_64-qcow2_customize-boot.json index c4b4d9834..3b57ac764 100644 --- a/test/data/manifests/rhel_91-x86_64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_91-x86_64-qcow2_customize-boot.json @@ -5568,18 +5568,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5663,6 +5651,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_91-x86_64-vhd-boot.json b/test/data/manifests/rhel_91-x86_64-vhd-boot.json index c65f306e5..dee4a8499 100644 --- a/test/data/manifests/rhel_91-x86_64-vhd-boot.json +++ b/test/data/manifests/rhel_91-x86_64-vhd-boot.json @@ -6344,19 +6344,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -6595,6 +6582,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_92-aarch64-ami-boot.json b/test/data/manifests/rhel_92-aarch64-ami-boot.json index 670337f60..eed47663d 100644 --- a/test/data/manifests/rhel_92-aarch64-ami-boot.json +++ b/test/data/manifests/rhel_92-aarch64-ami-boot.json @@ -4407,24 +4407,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target", - "tuned" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4596,6 +4578,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target", + "tuned" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_92-aarch64-azure_rhui-boot.json b/test/data/manifests/rhel_92-aarch64-azure_rhui-boot.json index b9b573cdb..cf60b439a 100644 --- a/test/data/manifests/rhel_92-aarch64-azure_rhui-boot.json +++ b/test/data/manifests/rhel_92-aarch64-azure_rhui-boot.json @@ -6065,19 +6065,6 @@ "zone": "Etc/UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -6347,6 +6334,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_92-aarch64-ec2-boot.json b/test/data/manifests/rhel_92-aarch64-ec2-boot.json index 537a90720..40e417579 100644 --- a/test/data/manifests/rhel_92-aarch64-ec2-boot.json +++ b/test/data/manifests/rhel_92-aarch64-ec2-boot.json @@ -4450,24 +4450,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target", - "tuned" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4629,6 +4611,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target", + "tuned" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_92-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_92-aarch64-edge_commit-boot.json index 14c82d056..08cf4ec1f 100644 --- a/test/data/manifests/rhel_92-aarch64-edge_commit-boot.json +++ b/test/data/manifests/rhel_92-aarch64-edge_commit-boot.json @@ -4519,19 +4519,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service", - "ignition-firstboot-complete.service", - "coreos-ignition-write-issues.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4564,6 +4551,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service", + "ignition-firstboot-complete.service", + "coreos-ignition-write-issues.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_92-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_92-aarch64-edge_commit_with_container-boot.json index 10006bbc4..65add64a4 100644 --- a/test/data/manifests/rhel_92-aarch64-edge_commit_with_container-boot.json +++ b/test/data/manifests/rhel_92-aarch64-edge_commit_with_container-boot.json @@ -4568,19 +4568,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service", - "ignition-firstboot-complete.service", - "coreos-ignition-write-issues.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4613,6 +4600,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service", + "ignition-firstboot-complete.service", + "coreos-ignition-write-issues.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_92-aarch64-edge_container-boot.json b/test/data/manifests/rhel_92-aarch64-edge_container-boot.json index cf0f0cc32..8f34d2d12 100644 --- a/test/data/manifests/rhel_92-aarch64-edge_container-boot.json +++ b/test/data/manifests/rhel_92-aarch64-edge_container-boot.json @@ -4519,19 +4519,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service", - "ignition-firstboot-complete.service", - "coreos-ignition-write-issues.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4564,6 +4551,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service", + "ignition-firstboot-complete.service", + "coreos-ignition-write-issues.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_92-aarch64-qcow2-boot.json b/test/data/manifests/rhel_92-aarch64-qcow2-boot.json index cb321eb72..02930f8f8 100644 --- a/test/data/manifests/rhel_92-aarch64-qcow2-boot.json +++ b/test/data/manifests/rhel_92-aarch64-qcow2-boot.json @@ -4610,12 +4610,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4692,6 +4686,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_92-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_92-aarch64-qcow2_customize-boot.json index 383925b39..17a041bca 100644 --- a/test/data/manifests/rhel_92-aarch64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_92-aarch64-qcow2_customize-boot.json @@ -4935,18 +4935,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5029,6 +5017,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_92-aarch64-vhd-boot.json b/test/data/manifests/rhel_92-aarch64-vhd-boot.json index ec921b04c..aa9854fd7 100644 --- a/test/data/manifests/rhel_92-aarch64-vhd-boot.json +++ b/test/data/manifests/rhel_92-aarch64-vhd-boot.json @@ -6016,19 +6016,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -6266,6 +6253,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_92-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_92-ppc64le-qcow2-boot.json index ed9e9eeb9..77f732b8d 100644 --- a/test/data/manifests/rhel_92-ppc64le-qcow2-boot.json +++ b/test/data/manifests/rhel_92-ppc64le-qcow2-boot.json @@ -5266,12 +5266,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5338,6 +5332,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_92-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_92-ppc64le-qcow2_customize-boot.json index f3edfb7b3..586221b30 100644 --- a/test/data/manifests/rhel_92-ppc64le-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_92-ppc64le-qcow2_customize-boot.json @@ -5575,18 +5575,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5659,6 +5647,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_92-s390x-qcow2-boot.json b/test/data/manifests/rhel_92-s390x-qcow2-boot.json index 60c15daec..2bcaef4a8 100644 --- a/test/data/manifests/rhel_92-s390x-qcow2-boot.json +++ b/test/data/manifests/rhel_92-s390x-qcow2-boot.json @@ -5499,12 +5499,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5562,6 +5556,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_92-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_92-s390x-qcow2_customize-boot.json index a152d2dcd..ee6174bbe 100644 --- a/test/data/manifests/rhel_92-s390x-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_92-s390x-qcow2_customize-boot.json @@ -5816,18 +5816,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5891,6 +5879,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_92-x86_64-ami-boot.json b/test/data/manifests/rhel_92-x86_64-ami-boot.json index f09429423..20f4c7cfc 100644 --- a/test/data/manifests/rhel_92-x86_64-ami-boot.json +++ b/test/data/manifests/rhel_92-x86_64-ami-boot.json @@ -4375,24 +4375,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target", - "tuned" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4573,6 +4555,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target", + "tuned" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_92-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_92-x86_64-azure_rhui-boot.json index ab84d27ef..e0fc05eaa 100644 --- a/test/data/manifests/rhel_92-x86_64-azure_rhui-boot.json +++ b/test/data/manifests/rhel_92-x86_64-azure_rhui-boot.json @@ -6369,19 +6369,6 @@ "zone": "Etc/UTC" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -6652,6 +6639,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_92-x86_64-ec2-boot.json b/test/data/manifests/rhel_92-x86_64-ec2-boot.json index 5c3c33f20..39ca19a0e 100644 --- a/test/data/manifests/rhel_92-x86_64-ec2-boot.json +++ b/test/data/manifests/rhel_92-x86_64-ec2-boot.json @@ -4420,24 +4420,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target", - "tuned" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4608,6 +4590,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target", + "tuned" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_92-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_92-x86_64-ec2_ha-boot.json index f0033a685..41dea1ed9 100644 --- a/test/data/manifests/rhel_92-x86_64-ec2_ha-boot.json +++ b/test/data/manifests/rhel_92-x86_64-ec2_ha-boot.json @@ -5864,24 +5864,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target", - "tuned" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -6052,6 +6034,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target", + "tuned" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_92-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_92-x86_64-ec2_sap-boot.json index 3ad999577..5ebf1b6a3 100644 --- a/test/data/manifests/rhel_92-x86_64-ec2_sap-boot.json +++ b/test/data/manifests/rhel_92-x86_64-ec2_sap-boot.json @@ -8254,24 +8254,6 @@ "leapsectz": "" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "NetworkManager", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "cloud-init", - "cloud-init-local", - "cloud-config", - "cloud-final", - "reboot.target", - "tuned" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -8559,6 +8541,24 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "NetworkManager", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "cloud-init", + "cloud-init-local", + "cloud-config", + "cloud-final", + "reboot.target", + "tuned" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_92-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_92-x86_64-edge_commit-boot.json index 9c9035b49..124c4bd67 100644 --- a/test/data/manifests/rhel_92-x86_64-edge_commit-boot.json +++ b/test/data/manifests/rhel_92-x86_64-edge_commit-boot.json @@ -4730,19 +4730,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service", - "ignition-firstboot-complete.service", - "coreos-ignition-write-issues.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4775,6 +4762,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service", + "ignition-firstboot-complete.service", + "coreos-ignition-write-issues.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_92-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_92-x86_64-edge_commit_rt-boot.json index 2d3fd4ff3..b54c2ce48 100644 --- a/test/data/manifests/rhel_92-x86_64-edge_commit_rt-boot.json +++ b/test/data/manifests/rhel_92-x86_64-edge_commit_rt-boot.json @@ -5121,19 +5121,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service", - "ignition-firstboot-complete.service", - "coreos-ignition-write-issues.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5166,6 +5153,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service", + "ignition-firstboot-complete.service", + "coreos-ignition-write-issues.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_92-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_92-x86_64-edge_commit_with_container-boot.json index 6d7a98e80..223202d58 100644 --- a/test/data/manifests/rhel_92-x86_64-edge_commit_with_container-boot.json +++ b/test/data/manifests/rhel_92-x86_64-edge_commit_with_container-boot.json @@ -4779,19 +4779,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service", - "ignition-firstboot-complete.service", - "coreos-ignition-write-issues.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4824,6 +4811,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service", + "ignition-firstboot-complete.service", + "coreos-ignition-write-issues.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_92-x86_64-edge_container-boot.json b/test/data/manifests/rhel_92-x86_64-edge_container-boot.json index c05cf8c8a..8963983f3 100644 --- a/test/data/manifests/rhel_92-x86_64-edge_container-boot.json +++ b/test/data/manifests/rhel_92-x86_64-edge_container-boot.json @@ -4719,19 +4719,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "sshd.service", - "fdo-client-linuxapp.service", - "ignition-firstboot-complete.service", - "coreos-ignition-write-issues.service" - ] - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4764,6 +4751,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "NetworkManager.service", + "firewalld.service", + "sshd.service", + "fdo-client-linuxapp.service", + "ignition-firstboot-complete.service", + "coreos-ignition-write-issues.service" + ] + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_92-x86_64-gce-boot.json b/test/data/manifests/rhel_92-x86_64-gce-boot.json index 12bf6ba50..0d5d1ae68 100644 --- a/test/data/manifests/rhel_92-x86_64-gce-boot.json +++ b/test/data/manifests/rhel_92-x86_64-gce-boot.json @@ -4715,21 +4715,6 @@ ] } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "rngd", - "dnf-automatic.timer" - ], - "disabled_services": [ - "sshd-keygen@", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.firewall", "options": { @@ -4882,6 +4867,21 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "rngd", + "dnf-automatic.timer" + ], + "disabled_services": [ + "sshd-keygen@", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_92-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_92-x86_64-gce_rhui-boot.json index 5dd711abc..733e6cb8b 100644 --- a/test/data/manifests/rhel_92-x86_64-gce_rhui-boot.json +++ b/test/data/manifests/rhel_92-x86_64-gce_rhui-boot.json @@ -4718,21 +4718,6 @@ ] } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd", - "rngd", - "dnf-automatic.timer" - ], - "disabled_services": [ - "sshd-keygen@", - "reboot.target" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.firewall", "options": { @@ -4888,6 +4873,21 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd", + "rngd", + "dnf-automatic.timer" + ], + "disabled_services": [ + "sshd-keygen@", + "reboot.target" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_92-x86_64-oci-boot.json b/test/data/manifests/rhel_92-x86_64-oci-boot.json index 7e25f9351..801e4dfd5 100644 --- a/test/data/manifests/rhel_92-x86_64-oci-boot.json +++ b/test/data/manifests/rhel_92-x86_64-oci-boot.json @@ -4869,12 +4869,6 @@ "zone": "America/New_York" } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4952,6 +4946,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_92-x86_64-qcow2-boot.json b/test/data/manifests/rhel_92-x86_64-qcow2-boot.json index cfb188bed..8b13d4cc1 100644 --- a/test/data/manifests/rhel_92-x86_64-qcow2-boot.json +++ b/test/data/manifests/rhel_92-x86_64-qcow2-boot.json @@ -4890,12 +4890,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -4973,6 +4967,12 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_92-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_92-x86_64-qcow2_customize-boot.json index 93f638e25..dc89600e3 100644 --- a/test/data/manifests/rhel_92-x86_64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_92-x86_64-qcow2_customize-boot.json @@ -5295,18 +5295,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "sshd.socket" - ], - "disabled_services": [ - "bluetooth.service" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -5390,6 +5378,18 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "sshd.socket" + ], + "disabled_services": [ + "bluetooth.service" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": { diff --git a/test/data/manifests/rhel_92-x86_64-vhd-boot.json b/test/data/manifests/rhel_92-x86_64-vhd-boot.json index 6dd83562b..eaade6fbb 100644 --- a/test/data/manifests/rhel_92-x86_64-vhd-boot.json +++ b/test/data/manifests/rhel_92-x86_64-vhd-boot.json @@ -6336,19 +6336,6 @@ } } }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "firewalld", - "nm-cloud-setup.service", - "nm-cloud-setup.timer", - "sshd", - "waagent" - ], - "default_target": "multi-user.target" - } - }, { "type": "org.osbuild.sysconfig", "options": { @@ -6587,6 +6574,19 @@ } } }, + { + "type": "org.osbuild.systemd", + "options": { + "enabled_services": [ + "firewalld", + "nm-cloud-setup.service", + "nm-cloud-setup.timer", + "sshd", + "waagent" + ], + "default_target": "multi-user.target" + } + }, { "type": "org.osbuild.selinux", "options": {