Accepting request 540190 from Base:System

- Enable ModemManager.service by default (bsc#1038402). (forwarded request 540058 from JonathanKang)

OBS-URL: https://build.opensuse.org/request/show/540190
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd-presets-branding-openSUSE?expand=0&rev=48
This commit is contained in:
Dominique Leuenberger 2017-11-10 13:42:42 +00:00 committed by Git OBS Bridge
commit 6300dd50cd
4 changed files with 57 additions and 41 deletions

36
default-SUSE.preset Normal file
View File

@ -0,0 +1,36 @@
enable YaST2-Firstboot.service
enable YaST2-Second-Stage.service
enable apparmor.service
enable auditd.service
enable avahi-daemon.service
enable ca-certificates.path
enable ca-certificates.service
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 logrotate.timer
enable lvm2-lvmetad.socket
enable mcelog.service
enable ModemManager.service
enable nscd.service
enable postfix.service
enable purge-kernels.service
enable remote-fs.target
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

View File

@ -1,40 +1,5 @@
enable YaST2-Firstboot.service
enable YaST2-Second-Stage.service
enable apparmor.service
enable auditd.service
enable avahi-daemon.service
enable ca-certificates.path
enable ca-certificates.service
enable cron.service
enable cups.path
enable cups.service
enable cups.socket
enable display-manager.service
enable dm-event.socket
enable epmd.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 logrotate.timer
enable lvm2-lvmetad.socket
enable mcelog.service
enable nscd.service
enable postfix.service
enable purge-kernels.service
enable remote-fs.target
enable restorecond.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

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
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

View File

@ -24,9 +24,10 @@ Release: 0
Summary: Systemd default presets for openSUSE
License: GPL-2.0+
Group: System/Base
Source0: default-openSUSE.preset
Source1: 99-default-disable.preset
Source2: branding-preset-states
Source0: default-SUSE.preset
Source1: default-openSUSE.preset
Source2: 99-default-disable.preset
Source3: branding-preset-states
# FIXME: why systemd is required ?
BuildRequires: systemd
#!BuildIgnore: systemd-presets-branding
@ -51,9 +52,13 @@ Default presets for systemd on openSUSE distribution.
%install
mkdir -p %{buildroot}%{_prefix}/lib/%{generic_name}
mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-preset
install -m644 %{SOURCE0} %{buildroot}%{_prefix}/lib/systemd/system-preset/90-default-openSUSE.preset
install -m644 %{SOURCE1} %{buildroot}%{_prefix}/lib/systemd/system-preset/
install -m755 %{SOURCE2} %{buildroot}%{_prefix}/lib/%{generic_name}/
# 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
# everything that must be enabled only in openSUSE
install -m644 %{SOURCE1} %{buildroot}%{_prefix}/lib/systemd/system-preset/90-default-openSUSE.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,