diff --git a/branding-preset-states b/branding-preset-states index 8a364b4..a593de1 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 --type=service,socket list-unit-files + /usr/bin/systemctl list-unit-files fi >systemd_preset-states.rpm-tmp exec 3 + +- Enable new unbound-anchor timer to keep root.key updated + (bsc#1115417) + ------------------------------------------------------------------- Thu Dec 13 03:58:53 UTC 2018 - Neil Brown diff --git a/systemd-presets-common-SUSE.spec b/systemd-presets-common-SUSE.spec index 38f806e..bcbd54a 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) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,6 +27,7 @@ Group: System/Base Source0: default-SUSE.preset Source2: 99-default-disable.preset Source3: branding-preset-states +Source4: default-SUSE-user.preset BuildRequires: systemd #!BuildIgnore: systemd-presets-branding PreReq: coreutils @@ -48,11 +49,13 @@ Default presets for systemd on SUSE based distributions. %install mkdir -p %{buildroot}%{_prefix}/lib/%{generic_name} mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-preset +mkdir -p %{buildroot}%{_prefix}/lib/systemd/user-preset # everything that must be enabled to have a working system. # shared across all brands -install -m644 %{SOURCE0} %{buildroot}%{_prefix}/lib/systemd/system-preset/90-default-SUSE.preset +install -m644 %{SOURCE0} %{buildroot}%{_prefix}/lib/systemd/system-preset/95-default-SUSE.preset install -m644 %{SOURCE2} %{buildroot}%{_prefix}/lib/systemd/system-preset/ install -m755 %{SOURCE3} %{buildroot}%{_prefix}/lib/%{generic_name}/ +install -m644 %{SOURCE4} %{buildroot}%{_prefix}/lib/systemd/user-preset/95-default-SUSE.preset %pre # On initial installation, branding-preset-states does not yet exist, @@ -91,5 +94,6 @@ rm -f /run/rpm-%{name}-preset-all %defattr(-,root,root) %{_prefix}/lib/%{generic_name}/ %{_prefix}/lib/systemd/system-preset/* +%{_prefix}/lib/systemd/user-preset/* %changelog