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

rename 90-display-manager.preset to 85-display-manager.preset

Browse Source
This commit is contained in:
Lennart Poettering 2013-06-06 11:48:14 +02:00
parent 4b90fcc13b
commit c905fb88c8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
90-display-manager.preset → 85-display-manager.preset
View File

10
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: 4%{?gitcommit:.git%{gitcommit}}%{?dist} Release: 5%{?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,7 +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
Source5: 90-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
# Stop-gap, just to ensure things work fine with rsyslog without having to change the package right-away # Stop-gap, just to ensure things work fine with rsyslog without having to change the package right-away
@ -634,8 +634,8 @@ fi
%{_prefix}/lib/tmpfiles.d/legacy.conf %{_prefix}/lib/tmpfiles.d/legacy.conf
%{_prefix}/lib/tmpfiles.d/tmp.conf %{_prefix}/lib/tmpfiles.d/tmp.conf
%{_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/90-default.preset %{_prefix}/lib/systemd/system-preset/90-default.preset
%{_prefix}/lib/systemd/system-preset/90-display-manager.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
@ -680,7 +680,6 @@ fi
%{_datadir}/bash-completion/completions/udevadm %{_datadir}/bash-completion/completions/udevadm
%{_datadir}/bash-completion/completions/systemd-analyze %{_datadir}/bash-completion/completions/systemd-analyze
# Make sure we don't remove runlevel targets from F14 alpha installs, # Make sure we don't remove runlevel targets from F14 alpha installs,
# but make sure we don't create then anew. # but make sure we don't create then anew.
%ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel2.target %ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel2.target
@ -754,6 +753,9 @@ fi
%{_libdir}/pkgconfig/gudev-1.0* %{_libdir}/pkgconfig/gudev-1.0*
%changelog %changelog
* 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)
* Tue May 28 2013 Harald Hoyer <harald@redhat.com> 204-4 * Tue May 28 2013 Harald Hoyer <harald@redhat.com> 204-4
- Fix kernel-install (#965897) - Fix kernel-install (#965897)