From ccc79d0fd56f938af430fbd432013e99b602cb63128d667706790c37d6b08ec1 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 11 Dec 2017 07:30:19 +0000 Subject: [PATCH 1/3] Accepting request 554793 from home:kukuk:branches:Base:System - Enable btrfs-*.timer by default, switch from cron to systemd.timer - Enable btrfsmaintenance-refresh.service OBS-URL: https://build.opensuse.org/request/show/554793 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-presets-branding-openSUSE?expand=0&rev=101 --- default-SUSE.preset | 5 +++++ systemd-presets-branding-openSUSE.changes | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/default-SUSE.preset b/default-SUSE.preset index 089f4bf..27d0b6d 100644 --- a/default-SUSE.preset +++ b/default-SUSE.preset @@ -3,6 +3,11 @@ enable YaST2-Second-Stage.service enable apparmor.service enable auditd.service enable avahi-daemon.service +enable btrfs-balance.timer +enable btrfs-defrag.timer +enable btrfs-scrub.timer +enable btrfs-trim.timer +enable btrfsmaintenance-refresh.service enable ca-certificates.path enable ca-certificates.service enable cron.service diff --git a/systemd-presets-branding-openSUSE.changes b/systemd-presets-branding-openSUSE.changes index a61302d..4b5f658 100644 --- a/systemd-presets-branding-openSUSE.changes +++ b/systemd-presets-branding-openSUSE.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Dec 6 13:47:02 CET 2017 - kukuk@suse.de + +- Enable btrfs-*.timer by default, switch from cron to systemd.timer +- Enable btrfsmaintenance-refresh.service + ------------------------------------------------------------------- Thu Nov 9 02:08:17 UTC 2017 - sckang@suse.com From d35d212d2e36c683bc76f15690cf061c4e7cd2de459225d68c6ae23738a8e215 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 11 Dec 2017 16:11:14 +0000 Subject: [PATCH 2/3] Accepting request 556009 from home:kukuk:branches:Base:System - If we do a fresh installation, call systemctl preset-all in the %posttrans section. Some services need to be installed before systemd or do not strictly require systemd, so systemd would only be installed after them and the systemd units of this package never enabled. - Enable klog.service and rsyslog.service by default, currently they enable themself always in post install section. OBS-URL: https://build.opensuse.org/request/show/556009 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-presets-branding-openSUSE?expand=0&rev=102 --- default-SUSE.preset | 2 ++ systemd-presets-branding-openSUSE.changes | 15 +++++++++++++++ systemd-presets-branding-openSUSE.spec | 8 ++++++++ 3 files changed, 25 insertions(+) diff --git a/default-SUSE.preset b/default-SUSE.preset index 27d0b6d..d65e489 100644 --- a/default-SUSE.preset +++ b/default-SUSE.preset @@ -21,6 +21,7 @@ enable irqbalance.service enable iscsi.service enable iscsid.socket enable issue-generator.service +enable klog.service enable logrotate.timer enable lvm2-lvmetad.socket enable mcelog.service @@ -29,6 +30,7 @@ enable nscd.service enable postfix.service enable purge-kernels.service enable remote-fs.target +enable rsyslog.service enable shadow.timer enable smartd.service enable snapper-cleanup.timer diff --git a/systemd-presets-branding-openSUSE.changes b/systemd-presets-branding-openSUSE.changes index 4b5f658..589c4a6 100644 --- a/systemd-presets-branding-openSUSE.changes +++ b/systemd-presets-branding-openSUSE.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Dec 11 16:17:30 CET 2017 - kukuk@suse.de + +- If we do a fresh installation, call systemctl preset-all in the + %posttrans section. Some services need to be installed before + systemd or do not strictly require systemd, so systemd would only + be installed after them and the systemd units of this package + never enabled. + +------------------------------------------------------------------- +Mon Dec 11 16:02:43 CET 2017 - kukuk@suse.de + +- Enable klog.service and rsyslog.service by default, currently + they enable themself always in post install section. + ------------------------------------------------------------------- Wed Dec 6 13:47:02 CET 2017 - kukuk@suse.de diff --git a/systemd-presets-branding-openSUSE.spec b/systemd-presets-branding-openSUSE.spec index 5d0c9cf..59206a8 100644 --- a/systemd-presets-branding-openSUSE.spec +++ b/systemd-presets-branding-openSUSE.spec @@ -71,6 +71,8 @@ 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 +elif [ $1 -eq 1 ]; then + touch /run/rpm-%{name}-preset-all fi %post @@ -82,6 +84,12 @@ if [ $1 -gt 1 ] ; then %{_prefix}/lib/%{generic_name}/branding-preset-states apply-changes fi +%posttrans +if [ -f /run/rpm-%{name}-preset-all ]; then + systemctl preset-all +fi +rm -f /run/rpm-%{name}-preset-all + %files %defattr(-,root,root) %{_prefix}/lib/%{generic_name}/ From 75db22dba5c3cee2f33cb5c4eccae12e1b33a1b6597a055963f96d1c0b73d9cc Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 12 Dec 2017 09:18:50 +0000 Subject: [PATCH 3/3] Accepting request 556408 from home:kukuk:branches:Base:System - Don't disable services with preset-all in %posttrans, the network is special and would be disabled. OBS-URL: https://build.opensuse.org/request/show/556408 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-presets-branding-openSUSE?expand=0&rev=103 --- systemd-presets-branding-openSUSE.changes | 6 ++++++ systemd-presets-branding-openSUSE.spec | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/systemd-presets-branding-openSUSE.changes b/systemd-presets-branding-openSUSE.changes index 589c4a6..a42c31c 100644 --- a/systemd-presets-branding-openSUSE.changes +++ b/systemd-presets-branding-openSUSE.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 12 10:05:57 CET 2017 - kukuk@suse.de + +- Don't disable services with preset-all in %posttrans, the network + is special and would be disabled. + ------------------------------------------------------------------- Mon Dec 11 16:17:30 CET 2017 - kukuk@suse.de diff --git a/systemd-presets-branding-openSUSE.spec b/systemd-presets-branding-openSUSE.spec index 59206a8..13fc817 100644 --- a/systemd-presets-branding-openSUSE.spec +++ b/systemd-presets-branding-openSUSE.spec @@ -86,7 +86,10 @@ fi %posttrans if [ -f /run/rpm-%{name}-preset-all ]; then - systemctl preset-all + # Enable all services, which were installed before systemd + # Don't disable services, since this would disable the + # complete network stack. + systemctl preset-all --preset-mode=enable-only fi rm -f /run/rpm-%{name}-preset-all