rpms/systemd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

systemd-204-6

Browse Source 
- introduce 99-default-disable.preset
This commit is contained in:
Harald Hoyer 2013-06-06 12:55:08 +02:00
parent c905fb88c8
commit 2cfbb4e8fb
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
90-default.preset
View File

@ -90,6 +90,3 @@ enable udisks2.service
enable polkit.service enable polkit.service
enable packagekit-offline-update.service enable packagekit-offline-update.service
enable PackageKit.service enable PackageKit.service
# Enforce Fedora's disable-by-default policy
disable *

1
99-default-disable.preset Normal file
View File

@ -0,0 +1 @@
disable *

8
systemd.spec
View File

@ -13,7 +13,7 @@
Name: systemd Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 204 Version: 204
Release: 5%{?gitcommit:.git%{gitcommit}}%{?dist} Release: 6%{?gitcommit:.git%{gitcommit}}%{?dist}
# For a breakdown of the licensing, see README # For a breakdown of the licensing, see README
License: LGPLv2+ and MIT and GPLv2+ License: LGPLv2+ and MIT and GPLv2+
Summary: A System and Service Manager Summary: A System and Service Manager
@ -26,6 +26,7 @@ Source0: http://www.freedesktop.org/software/systemd/%{name}-%{version}.t
%endif %endif
# Fedora's default preset policy # Fedora's default preset policy
Source1: 90-default.preset Source1: 90-default.preset
Source7: 99-default-disable.preset
Source5: 85-display-manager.preset Source5: 85-display-manager.preset
# Feodora's SysV convert script. meh. # Feodora's SysV convert script. meh.
Source2: systemd-sysv-convert Source2: systemd-sysv-convert
@ -259,6 +260,7 @@ mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-preset/
mkdir -p %{buildroot}%{_prefix}/lib/systemd/user-preset/ mkdir -p %{buildroot}%{_prefix}/lib/systemd/user-preset/
install -m 0644 %{SOURCE1} %{buildroot}%{_prefix}/lib/systemd/system-preset/ install -m 0644 %{SOURCE1} %{buildroot}%{_prefix}/lib/systemd/system-preset/
install -m 0644 %{SOURCE5} %{buildroot}%{_prefix}/lib/systemd/system-preset/ install -m 0644 %{SOURCE5} %{buildroot}%{_prefix}/lib/systemd/system-preset/
install -m 0644 %{SOURCE7} %{buildroot}%{_prefix}/lib/systemd/system-preset/
# Make sure the shutdown/sleep drop-in dirs exist # Make sure the shutdown/sleep drop-in dirs exist
mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-shutdown/ mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-shutdown/
@ -636,6 +638,7 @@ fi
%{_prefix}/lib/sysctl.d/50-default.conf %{_prefix}/lib/sysctl.d/50-default.conf
%{_prefix}/lib/systemd/system-preset/85-display-manager.preset %{_prefix}/lib/systemd/system-preset/85-display-manager.preset
%{_prefix}/lib/systemd/system-preset/90-default.preset %{_prefix}/lib/systemd/system-preset/90-default.preset
%{_prefix}/lib/systemd/system-preset/99-default-disable.preset
%{_prefix}/lib/systemd/catalog/systemd.catalog %{_prefix}/lib/systemd/catalog/systemd.catalog
%{_prefix}/lib/kernel/install.d/50-depmod.install %{_prefix}/lib/kernel/install.d/50-depmod.install
%{_prefix}/lib/kernel/install.d/90-loaderentry.install %{_prefix}/lib/kernel/install.d/90-loaderentry.install
@ -753,6 +756,9 @@ fi
%{_libdir}/pkgconfig/gudev-1.0* %{_libdir}/pkgconfig/gudev-1.0*
%changelog %changelog
* Thu Jun 06 2013 Harald Hoyer <harald@redhat.com> 204-6
- introduce 99-default-disable.preset
* Thu Jun 6 2013 Lennart Poettering <lpoetter@redhat.com> - 204-5 * Thu Jun 6 2013 Lennart Poettering <lpoetter@redhat.com> - 204-5
- Rename 90-display-manager.preset to 85-display-manager.preset so that it actually takes precedence over 90-default.preset's "disable *" line (#903690) - Rename 90-display-manager.preset to 85-display-manager.preset so that it actually takes precedence over 90-default.preset's "disable *" line (#903690)