Accepting request 668077 from Base:System

Make sure mlocate is enabled by default. (forwarded request 667978 from psimons)

OBS-URL: https://build.opensuse.org/request/show/668077
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd-presets-common-SUSE?expand=0&rev=7

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<systemd_preset-states.rpm-tmp
 	read -u3 PAD

default-SUSE-user.preset

@@ -0,0 +1 @@
+enable pulseaudio.socket

default-SUSE.preset

@@ -22,6 +22,7 @@ enable haveged.service
 enable irqbalance.service
 enable iscsi.service
 enable iscsid.socket
+enable issue-generator.path
 enable issue-generator.service
 enable kbdsettings.service
 enable klog.service
@@ -30,6 +31,7 @@ enable lvm2-lvmetad.socket
 enable lvm2-monitor.service
 enable lvm2-lvmpolld.socket
 enable mcelog.service
+enable mlocate.timer
 enable ModemManager.service
 enable nscd.service
 enable postfix.service
@@ -42,7 +44,6 @@ enable smartd_generate_opts.path
 enable snapper-cleanup.timer
 enable snapper-timeline.timer
 enable storage-fixup.service
-enable updatedb.timer
 enable uuidd.socket
 enable vmblock-fuse.service
 enable vmtoolsd.service
@@ -51,3 +52,4 @@ enable pcscd.socket
 enable mandb.timer
 enable mdcheck_start.timer
 enable mdmonitor-oneshot.timer
+enable unbound-anchor.timer

systemd-presets-common-SUSE.changes

@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Wed Jan 23 12:07:56 CET 2019 - psimons@suse.com
+
+- Recent versions of mlocate don't use updatedb.timer any more.
+  Instead, the unit is called mlocate.timer. [boo#1115408]
+
+-------------------------------------------------------------------
+Fri Jan 18 23:01:47 CET 2019 - sbrabec@suse.com
+
+- branding-preset-states: Apply preset to all unit types
+  (bsc#1121219).
+- Rename 90-default-SUSE.preset to 95-default-SUSE.preset, so
+  product branding takes precedence over common presets.
+
+-------------------------------------------------------------------
+Tue Jan 15 17:26:42 CET 2019 - tiwai@suse.de
+
+- Add default user preset: currently containing only the new
+  pulseaudio.socket (bsc#1083473)
+
+-------------------------------------------------------------------
+Fri Jan 11 15:09:22 CET 2019 - kukuk@suse.de
+
+- Add issue-generator.path to make sure /etc/issue is really 
+  regenerated if snippets change [bsc#1116825]
+
+-------------------------------------------------------------------
+Wed Jan  9 16:20:10 UTC 2019 - Rubén Torrero Marijnissen <rtorreromarijnissen@suse.com>
+
+- Enable new unbound-anchor timer to keep root.key updated
+  (bsc#1115417)
+
 -------------------------------------------------------------------
 Thu Dec 13 03:58:53 UTC 2018 - Neil Brown <nfbrown@suse.com>
 

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