From 1e5f5bfc479ebc82300d22a01cb6384bebb1441b50e0d368d2b07feaf51f0eaf Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Wed, 22 Jun 2022 09:47:59 +0000
Subject: [PATCH 1/2] Accepting request 982585 from
 home:alarrosa:branches:Base:System

- Modify branding-preset-states to fix systemd-presets-common-SUSE
  not enabling new user systemd service preset configuration just
  as it handles system service presets. By passing an (optional)
  second parameter "user", the save/apply-changes commands now
  work with user services instead of system ones (boo#1200485)

OBS-URL: https://build.opensuse.org/request/show/982585
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-presets-common-SUSE?expand=0&rev=47
---
 branding-preset-states              | 12 +++++++++---
 systemd-presets-common-SUSE.changes |  9 +++++++++
 systemd-presets-common-SUSE.spec    |  4 +++-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/branding-preset-states b/branding-preset-states
index a593de1..d5499d6 100644
--- a/branding-preset-states
+++ b/branding-preset-states
@@ -69,7 +69,7 @@ apply_preset_state_changes () {
 		exec 3<&-
 	done
 	if test -x /usr/bin/systemctl ; then
-		/usr/bin/systemctl list-unit-files
+		/usr/bin/systemctl list-unit-files "$GLOBAL"
 	fi >systemd_preset-states.rpm-tmp
 	exec 3<systemd_preset-states.rpm-tmp
 	read -u3 PAD
@@ -99,7 +99,7 @@ apply_preset_state_changes () {
 		fi
 		if test "$ENABLE_OLD" != "$ENABLE_NEW" ; then
 			echo "Resetting $SERVICE to the new default: $ENABLE_NEW"
-			/usr/bin/systemctl preset "$SERVICE" || :
+			/usr/bin/systemctl preset "$GLOBAL" "$SERVICE" || :
 		fi
 	done
 	exec 3<&-
@@ -107,7 +107,13 @@ apply_preset_state_changes () {
 }
 
 
-cd /usr/lib/systemd/system-preset
+if test "$2" == "user" ; then
+  cd /usr/lib/systemd/user-preset
+  GLOBAL="--global"
+else
+  cd /usr/lib/systemd/system-preset
+  GLOBAL=""
+fi
 
 case $1 in
 apply-changes)
diff --git a/systemd-presets-common-SUSE.changes b/systemd-presets-common-SUSE.changes
index 33a2a83..be0a366 100644
--- a/systemd-presets-common-SUSE.changes
+++ b/systemd-presets-common-SUSE.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Jun 14 09:25:09 UTC 2022 - Antonio Larrosa <alarrosa@suse.com>
+
+- Modify branding-preset-states to fix systemd-presets-common-SUSE
+  not enabling new user systemd service preset configuration just
+  as it handles system service presets. By passing an (optional)
+  second parameter "user", the save/apply-changes commands now
+  work with user services instead of system ones (boo#1200485)
+
 -------------------------------------------------------------------
 Mon Apr 11 07:45:59 UTC 2022 - Jonathan Kang <songchuan.kang@suse.com>
 
diff --git a/systemd-presets-common-SUSE.spec b/systemd-presets-common-SUSE.spec
index 01a7a14..5ad62fa 100644
--- a/systemd-presets-common-SUSE.spec
+++ b/systemd-presets-common-SUSE.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package systemd-presets-common-SUSE
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -68,6 +68,7 @@ if [ $1 -gt 1 -a -x %{_prefix}/lib/%{generic_name}/branding-preset-states ] ; th
 	# Note: the old version of the script is used here.
 	#
 	%{_prefix}/lib/%{generic_name}/branding-preset-states save
+	%{_prefix}/lib/%{generic_name}/branding-preset-states save user
 elif [ $1 -eq 1 ]; then
   touch /run/rpm-%{name}-preset-all
 fi
@@ -79,6 +80,7 @@ if [ $1 -gt 1 ] ; then
 	# that have been changed and apply "systemct preset" on them.
 	#
 	%{_prefix}/lib/%{generic_name}/branding-preset-states apply-changes
+	%{_prefix}/lib/%{generic_name}/branding-preset-states apply-changes user
 fi
 
 %posttrans

From 3d8c7769fe37e17ddf0d0e65aed196695d087192d7be61b10b80f4dc529cee7c Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Wed, 22 Jun 2022 10:57:44 +0000
Subject: [PATCH 2/2] Accepting request 981551 from
 home:fos:branches:Base:System

Enable ignition-delete-config by default (security issue, see bsc#1199524)

OBS-URL: https://build.opensuse.org/request/show/981551
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-presets-common-SUSE?expand=0&rev=48
---
 default-SUSE.preset                 | 1 +
 systemd-presets-common-SUSE.changes | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/default-SUSE.preset b/default-SUSE.preset
index d7fb245..dd415b9 100644
--- a/default-SUSE.preset
+++ b/default-SUSE.preset
@@ -22,6 +22,7 @@ disable fstrim.service
 enable fstrim.timer
 enable getty@.service
 enable hcn-init.service
+enable ignition-delete-config.service
 enable ignition-firstboot-complete.service
 enable irqbalance.service
 enable iscsi.service
diff --git a/systemd-presets-common-SUSE.changes b/systemd-presets-common-SUSE.changes
index be0a366..2574c96 100644
--- a/systemd-presets-common-SUSE.changes
+++ b/systemd-presets-common-SUSE.changes
@@ -7,6 +7,11 @@ Tue Jun 14 09:25:09 UTC 2022 - Antonio Larrosa <alarrosa@suse.com>
   second parameter "user", the save/apply-changes commands now
   work with user services instead of system ones (boo#1200485)
 
+-------------------------------------------------------------------
+Mon May 23 12:37:54 UTC 2022 - Ignaz Forster <iforster@suse.com>
+
+- enable ignition-delete-config by default (bsc#1199524)
+
 -------------------------------------------------------------------
 Mon Apr 11 07:45:59 UTC 2022 - Jonathan Kang <songchuan.kang@suse.com>