From 129565213639b26e1d668b7d0f54a3c3683f92bf6dd5696b6618a5751fa3773e Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 1 Mar 2018 08:25:13 +0000 Subject: [PATCH] Accepting request 581531 from home:msmeissn:branches:Base:System new package, forked off the branding OBS-URL: https://build.opensuse.org/request/show/581531 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-presets-common-SUSE?expand=0&rev=1 --- .gitattributes | 23 ++ .gitignore | 1 + 99-default-disable.preset | 1 + branding-preset-states | 120 ++++++++ default-SUSE.preset | 50 ++++ systemd-presets-common-SUSE.changes | 407 ++++++++++++++++++++++++++++ systemd-presets-common-SUSE.spec | 95 +++++++ 7 files changed, 697 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 99-default-disable.preset create mode 100644 branding-preset-states create mode 100644 default-SUSE.preset create mode 100644 systemd-presets-common-SUSE.changes create mode 100644 systemd-presets-common-SUSE.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/99-default-disable.preset b/99-default-disable.preset new file mode 100644 index 0000000..8b60a70 --- /dev/null +++ b/99-default-disable.preset @@ -0,0 +1 @@ +disable * diff --git a/branding-preset-states b/branding-preset-states new file mode 100644 index 0000000..8a364b4 --- /dev/null +++ b/branding-preset-states @@ -0,0 +1,120 @@ +#! /bin/bash +# +# Written by sbrabec@suse.com +# +declare -a PRESET_FILES +declare -A PRESETS +declare -A PRESETS_OLD +declare -A PRESETS_OLD_WILDCARD +declare -A PRESETS_WILDCARD + +save_preset_states () { + PRESET_FILES=(*.preset) + + for ((i=${#PRESET_FILES[@]}-1 ; i>= 0 ; i-- )) ; do + FILE=${PRESET_FILES[i]} + exec 3<"$FILE" + while read -u3 ENABLE SERVICE PAD ; do + if test -z "$SERVICE" ; then + continue; + fi + case "$ENABLE" in + enable|disable) + PRESETS[$SERVICE]=$ENABLE;; + esac + done + exec 3<&- + done + exec 3>systemd_preset-old.rpm-tmp + for PRESET in "${!PRESETS[@]}" ; do + echo >&3 "${PRESETS[$PRESET]} $PRESET" + done + exec 3>&- +} + +apply_preset_state_changes () { + if ! test -f systemd_preset-old.rpm-tmp ; then + return + fi + exec 3= 0 ; i-- )) ; do + FILE=${PRESET_FILES[i]} + exec 3<"$FILE" + while read -u3 ENABLE SERVICE PAD ; do + if test -z "$SERVICE" ; then + continue + fi + case "$ENABLE" in + enable|disable) + case $SERVICE in + *"*"*|*"?"*) PRESETS_WILDCARD[$SERVICE]=$ENABLE;; + *) PRESETS[$SERVICE]=$ENABLE;; + esac + esac + done + exec 3<&- + done + if test -x /usr/bin/systemctl ; then + /usr/bin/systemctl --type=service,socket list-unit-files + fi >systemd_preset-states.rpm-tmp + exec 3&2 "Unkown command '$1'" + exit 1 +esac diff --git a/default-SUSE.preset b/default-SUSE.preset new file mode 100644 index 0000000..30bb6ac --- /dev/null +++ b/default-SUSE.preset @@ -0,0 +1,50 @@ +enable YaST2-Firstboot.service +enable YaST2-Second-Stage.service +enable apparmor.service +enable auditd.service +enable avahi-daemon.service +enable backup-rpmdb.timer +enable backup-sysconfig.timer +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 check-battery.timer +enable cron.service +enable display-manager.service +enable dm-event.socket +disable fstrim.service +enable fstrim.timer +enable getty@.service +enable haveged.service +enable irqbalance.service +enable iscsi.service +enable iscsid.socket +enable issue-generator.service +enable kbdsettings.service +enable klog.service +enable logrotate.timer +enable lvm2-lvmetad.socket +enable lvm2-monitor.service +enable lvm2-lvmpolld.socket +enable mcelog.service +enable ModemManager.service +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 +enable snapper-timeline.timer +enable storage-fixup.service +enable updatedb.timer +enable uuidd.socket +enable vmblock-fuse.service +enable vmtoolsd.service +enable xencommons.service +enable pcscd.socket diff --git a/systemd-presets-common-SUSE.changes b/systemd-presets-common-SUSE.changes new file mode 100644 index 0000000..104df58 --- /dev/null +++ b/systemd-presets-common-SUSE.changes @@ -0,0 +1,407 @@ +------------------------------------------------------------------- +Wed Feb 28 13:44:55 UTC 2018 - meissner@suse.com + +- split out common service to be default enabled on all SUSE + distributions from the branding. FATE#322139 + +------------------------------------------------------------------- +Mon Feb 5 11:28:07 CET 2018 - kukuk@suse.de + +- Enable backup-rpmdb.timer, backup-sysconfig.timer and + check-battery.timer, previously cron.daily jobs. + +------------------------------------------------------------------- +Tue Jan 2 21:17:07 CET 2018 - sbrabec@suse.com + +- Enable new kbdsettings.service (boo#1010880). + +------------------------------------------------------------------- +Mon Jan 1 11:27:23 UTC 2018 - wr@rosenauer.org + +- enable pcscd socket activation by default to support smartcards + out of the box (boo#1063983) + +------------------------------------------------------------------- +Fri Dec 29 07:53:26 UTC 2017 - zren@suse.com + +- Enable lvm2-lvmpolld.socket by default (bsc#1074211) + +------------------------------------------------------------------- +Tue Dec 19 10:12:47 UTC 2017 - zren@suse.com + +- Enable lvm2-monitor.service by default (bsc#1072492) + +------------------------------------------------------------------- +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 + +- 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 + +- 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 + +- Enable ModemManager.service by default (bsc#1038402). + +------------------------------------------------------------------- +Fri Nov 3 09:12:26 UTC 2017 - olaf@aepfle.de + +- Move common entries into default-SUSE.preset (bsc#1060676) + +------------------------------------------------------------------- +Tue Oct 17 06:11:39 UTC 2017 - olaf@aepfle.de + +- Sort entries with :'<,'>!sort -t ' ' -k 2 (bsc#1060676) + +------------------------------------------------------------------- +Tue Jun 20 08:59:59 CEST 2017 - kukuk@suse.de + +- Enable ca-certificates to run on boot and on demand to create + database in /var/lib/ca-certificates + +------------------------------------------------------------------- +Tue Mar 21 12:40:03 UTC 2017 - meissner@suse.com + +- removed duplicated iscsid.socket iscsid.servicce (bsc#1030161) + +------------------------------------------------------------------- +Fri Mar 17 17:04:13 CET 2017 - sbrabec@suse.com + +- Bump version to 12.2 to make version numbers consistent between + SLE and Leap (boo#1029775). +- Remove superfluous uuidd.service. uuidd.socket is sufficient + (bsc#1012850#c8). + +------------------------------------------------------------------- +Tue Feb 21 08:55:53 UTC 2017 - zren@suse.com + +- Enable socket/service(s) for lvm2 (bsc#1011053) + +------------------------------------------------------------------- +Fri Feb 10 09:46:22 UTC 2017 - fbui@suse.com + +- Enable by default uuidd shipped by util-linux (bsc#1012850) + + util-linux was previously shipping a preset file enabling uuidd by + default. This is now done here as other packages are not supposed to + ship their own preset rules. + + Also increase the package version so util-linux can conflict with + the previous versions and hence will be updated *after* the new + version of the presets package is. This is important otherwise if + util-linux removed its preset file first, then the presets package + would believe a new change in the presets and you enable again + uuidd. + +------------------------------------------------------------------- +Tue Jan 24 09:20:33 UTC 2017 - dimstar@opensuse.org + +- Enable the issue-generator.service by default: /etc/issue is in + progress of no longer being a static file, but being generated by + a service, which allows for much more flexible content (think + ssh key fingerprint or similar). + +------------------------------------------------------------------- +Thu Dec 15 08:42:09 UTC 2016 - dimstar@opensuse.org + +- Fix pre/post scripts: + + On %pre case, when updating from an old version of the package + that did not yet contain + %{_prefix}/lib/%{generic_name}/branding-preset-states, we can't + start it. Add a check for execute permission on the script. + +------------------------------------------------------------------- +Thu Dec 8 16:40:15 UTC 2016 - fbui@suse.com + +- Import preset macros from systemd-rpm-macro and convert them into + scripts. + + Presets are not supposed to be shipped by other packages as the + default policy needs to be reviewed by the secteam. Therefore don't + encourage packagers to do that and make those macros private to this + package. + + Also convert them into real scripts so they're much easier to + maintain and debug. Also working in %posttrans is unneeded as this + package is assumed to be the only one to update the preset. + +------------------------------------------------------------------- +Thu Dec 8 15:00:17 UTC 2016 - fbui@suse.com + +- There's no need to reload the daemon configuration as presets are + not part of the dameon config. + +------------------------------------------------------------------- +Tue Nov 29 12:17:22 UTC 2016 - meissner@suse.com + +- added snapper-cleanup.timer and snapper-timeline.timer (bsc#1011891) + +------------------------------------------------------------------- +Tue Jun 14 22:33:02 UTC 2016 - ken@suse.com + +- enable vmblock-fuse service for VMWare by default (bsc#986277) + +------------------------------------------------------------------- +Thu Jun 9 14:01:53 UTC 2016 - lnussel@suse.de + +- don't require systemd to avoid dependency loop (boo#983986) + +------------------------------------------------------------------- +Tue May 31 14:54:00 UTC 2016 - meissner@suse.com + +- added a prereq for coreutils to make sure the macro in %pre + works when using touch and mkdir. (bsc#982337) + +------------------------------------------------------------------- +Mon May 9 11:27:29 UTC 2016 - trenn@suse.de + +- enable mcelog by default instead of using an udev rule on + /dev/mcelog (bsc#976781) + +------------------------------------------------------------------- +Thu Mar 24 10:18:46 UTC 2016 - meissner@suse.com + +- enable remote-fs.target, getty@.service. (bsc#972489) + +------------------------------------------------------------------- +Wed Dec 16 13:21:29 UTC 2015 - lnussel@suse.de + +- don't enable ModemManager and wpa_supplicant. Both will be started + on demand (bnc#717130) + +------------------------------------------------------------------- +Wed Dec 16 11:47:20 UTC 2015 - eich@suse.com + +- Add display-manager.service to defaults presets (boo#958880). + +------------------------------------------------------------------- +Tue Dec 8 17:20:37 CET 2015 - sbrabec@suse.com + +- Enable fstrim.timer and disable fstrim.service. TRIM should be + performed once a week and not on every boot (FATE#317727). + http://www.spinics.net/lists/util-linux-ng/msg09133.html + +------------------------------------------------------------------- +Tue Aug 4 18:09:29 CEST 2015 - sbrabec@suse.com + +- Add %systemd_preset_pre and %systemd_preset_posttrans (fixes + boo#921075 and all future requests to change service default). + +------------------------------------------------------------------- +Wed Jul 15 14:29:34 UTC 2015 - jkeil@suse.de + +- Enable updatedb timer for mlocate package + * Replaces cron.daily script + +------------------------------------------------------------------- +Wed Jul 15 13:32:53 UTC 2015 - jkeil@suse.de + +- Enable timer for periodic password & group file integrity verification + +------------------------------------------------------------------- +Wed Jul 15 08:28:23 UTC 2015 - olaf@aepfle.de + +- Remove xendomains.service from systemd preset file because it + conflicts with libvirt-guests.service (bnc#937371) + Its up to the admin to run systemctl enable xendomains.service + +------------------------------------------------------------------- +Tue Jun 30 22:43:34 UTC 2015 - crrodriguez@opensuse.org + +- If selinux is used, restorecond should be enabled by default. + The relevant unit only starts if the system was booted with + selinux enabled +- Do not start acpid by default, its functionality is provided + by logind nowadays. + +------------------------------------------------------------------- +Wed Apr 1 18:34:50 UTC 2015 - crrodriguez@opensuse.org + +- Native systemd unit apparmor.service need to be enabled + by default. + +------------------------------------------------------------------- +Mon Mar 9 14:26:42 UTC 2015 - meissner@suse.com + +- enabled smartd by default (bnc#921075) + +------------------------------------------------------------------- +Tue Jan 13 17:51:26 UTC 2015 - olaf@aepfle.de + +- enable xencommons and xendomains (bnc#897352) + +------------------------------------------------------------------- +Fri Dec 19 21:31:02 UTC 2014 - mlatimer@suse.com + +- enable vmtoolsd service for VMWare by default (bnc#901272) + +------------------------------------------------------------------- +Wed Dec 3 07:21:35 UTC 2014 - lwang@suse.com + +- remove: enable lvm2-lvmetad.service (bnc#901859) + +------------------------------------------------------------------- +Thu Nov 20 17:07:10 UTC 2014 - gber@opensuse.org + +- enable storage-fixup.service by default due to conversion + +------------------------------------------------------------------- +Thu Jun 26 08:51:33 UTC 2014 - glin@suse.com + +- enable wpa_supplicant.service (bnc#860885 comment#20) + +------------------------------------------------------------------- +Wed May 28 06:40:13 UTC 2014 - lwang@suse.com + +- enable lvm2-lvmetad.socket (bnc#878473) + enable lvm2-lvmetad.service + +------------------------------------------------------------------- +Fri Apr 11 08:58:36 UTC 2014 - meissner@suse.com + +- enable auditd, haveged and irqbalance services by default. bnc#872066 + +------------------------------------------------------------------- +Wed Apr 2 23:54:58 UTC 2014 - crrodriguez@opensuse.org + +- Enable the logrotate.timer that replaces the cron-based + activation by default. + +------------------------------------------------------------------- +Fri Mar 7 17:31:10 UTC 2014 - matwey.kornilov@gmail.com + +- Enable epmd.socket so that epmd.service can be properly + socket-activated instead of forking by beam. The later leads to + the issue when epmd is killed at the stop of the specific service + and all erlang instances crashes as a consequence. + Needed by erlang package. (bnc#869112) + +------------------------------------------------------------------- +Thu Feb 13 11:44:28 PST 2014 - lduncan@suse.com + +- Enable iscsi daemon socket and iscsi service as installed, + so that iscsid.service can be socket-activated. (bnc#853300) + +------------------------------------------------------------------- +Sat Feb 1 09:54:04 CET 2014 - ohering@suse.de + +- Revert last change for hyper-v.rpm + Both daemons are started on demand via udev rules. + +------------------------------------------------------------------- +Wed Dec 18 15:54:08 CET 2013 - ohering@suse.de + +- Enable hv_kvp_daemon and hv_vss_daemon from hyper-v pkg + +------------------------------------------------------------------- +Thu Oct 17 10:38:17 PDT 2013 - lduncan@suse.com + +- Enable iscsid socket and iscsi service by default when + installed (bnc#827654). + +------------------------------------------------------------------- +Wed Jul 31 15:52:59 UTC 2013 - fcrozat@suse.com + +- Enable ModemManager.service is enabled when installed (it will be + dbus-activated by NM). + +------------------------------------------------------------------- +Thu Jul 25 12:12:04 UTC 2013 - fcrozat@suse.com + +- Rename main default file to 90-default-openSUSE.preset and move + the "disable everything" part to a separate file + "99-default-disable.preset". This allows fine tuning with + additional files, if needed (same as Fedora). + +------------------------------------------------------------------- +Fri May 3 11:30:28 UTC 2013 - meissner@suse.com + +- as we have multiversion kernels enabled by default, we also + need to enable purge-kernels by default (bnc#818317). + +------------------------------------------------------------------- +Fri Feb 22 09:04:00 UTC 2013 - mt@suse.com + +- Do not unconditionally enable NetworkManager service as this + breaks running /etc/init.d/network on update (bnc#803058). + +------------------------------------------------------------------- +Wed Oct 17 13:07:59 UTC 2012 - fcrozat@suse.com + +- Change location of presets with latest systemd. + +------------------------------------------------------------------- +Tue Sep 11 12:40:36 UTC 2012 - aj@suse.de + +- Add nscd service (bnc#778981). + +------------------------------------------------------------------- +Wed Jul 4 11:36:54 UTC 2012 - fcrozat@suse.com + +- Add cups units (service, path and socket) (bnc#769346). + +------------------------------------------------------------------- +Mon Dec 12 10:17:57 UTC 2011 - fcrozat@suse.com + +- Add postfix (bnc#727403). + +------------------------------------------------------------------- +Wed Oct 26 13:58:29 UTC 2011 - lnussel@suse.de + +- don't enable sysstat by default (bnc#725791) + +------------------------------------------------------------------- +Mon Oct 17 15:59:43 UTC 2011 - fcrozat@suse.com + +- Add sysstat.service (bnc#723858). + +------------------------------------------------------------------- +Sun Oct 16 09:52:50 UTC 2011 - coolo@suse.com + +- buildignore branding for systemd to avoid bootstrap cycle + +------------------------------------------------------------------- +Fri Oct 7 12:55:48 UTC 2011 - fcrozat@suse.com + +- Add Yast2 FirstBoot and Second Stage. + +------------------------------------------------------------------- +Thu Sep 29 10:47:35 UTC 2011 - fcrozat@suse.com + +- Don't enable avahi-dnsconfd.service after all. + +------------------------------------------------------------------- +Thu Sep 29 09:50:25 UTC 2011 - fcrozat@suse.com + +- Enable avahi-daemon.service and avahi-dnsconfd.service + +------------------------------------------------------------------- +Thu Sep 29 09:09:29 UTC 2011 - fcrozat@suse.com + +- Enable cron.service + +------------------------------------------------------------------- +Mon Sep 26 16:13:37 UTC 2011 - fcrozat@suse.com + +- Initial package + diff --git a/systemd-presets-common-SUSE.spec b/systemd-presets-common-SUSE.spec new file mode 100644 index 0000000..0a4aa93 --- /dev/null +++ b/systemd-presets-common-SUSE.spec @@ -0,0 +1,95 @@ +# +# spec file for package systemd-presets-branding-openSUSE +# +# Copyright (c) 2018 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%define generic_name systemd-presets-branding + +Name: systemd-presets-common-SUSE +Version: 15 +Release: 0 +Summary: Systemd default presets for SUSE distributions +License: GPL-2.0+ +Group: System/Base +Source0: default-SUSE.preset +Source2: 99-default-disable.preset +Source3: branding-preset-states +BuildRequires: systemd +#!BuildIgnore: systemd-presets-branding +PreReq: coreutils +Supplements: systemd +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch + +Requires(pre): bash +Requires(post): bash + +%description +Default presets for systemd on SUSE based distributions. + +%prep +%setup -q -T -c + +%build + +%install +mkdir -p %{buildroot}%{_prefix}/lib/%{generic_name} +mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-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 %{SOURCE2} %{buildroot}%{_prefix}/lib/systemd/system-preset/ +install -m755 %{SOURCE3} %{buildroot}%{_prefix}/lib/%{generic_name}/ + +%pre +# On initial installation, branding-preset-states does not yet exist, +# which is why we also check for the file to be present/executable +if [ $1 -gt 1 -a -x %{_prefix}/lib/%{generic_name}/branding-preset-states ] ; then + # + # Save the old state so we can detect which package have its + # default changed later. + # + # 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 +if [ $1 -gt 1 ] ; then + # + # Now that the updated presets are installed, find the ones + # that have been changed and apply "systemct preset" on them. + # + %{_prefix}/lib/%{generic_name}/branding-preset-states apply-changes +fi + +%posttrans +if [ -f /run/rpm-%{name}-preset-all ]; then + # 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 + +%files +%defattr(-,root,root) +%{_prefix}/lib/%{generic_name}/ +%{_prefix}/lib/systemd/system-preset/* + +%changelog