From c905fb88c833fdf5a5b242ed30534d51f0210846 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Jun 06 2013 09:48:14 +0000
Subject: rename 90-display-manager.preset to 85-display-manager.preset


---

diff --git a/85-display-manager.preset b/85-display-manager.preset
new file mode 100644
index 0000000..c1d3069
--- /dev/null
+++ b/85-display-manager.preset
@@ -0,0 +1,10 @@
+# We enable all display managers by default. Since only one can
+# actually be enabled at the same time the one which is installed
+# first wins
+
+enable gdm.service
+enable lightdm.service
+enable slim.service
+enable lxdm.service
+enable kdm.service
+enable xdm.service
diff --git a/90-display-manager.preset b/90-display-manager.preset
deleted file mode 100644
index c1d3069..0000000
--- a/90-display-manager.preset
+++ /dev/null
@@ -1,10 +0,0 @@
-# We enable all display managers by default. Since only one can
-# actually be enabled at the same time the one which is installed
-# first wins
-
-enable gdm.service
-enable lightdm.service
-enable slim.service
-enable lxdm.service
-enable kdm.service
-enable xdm.service
diff --git a/systemd.spec b/systemd.spec
index bf9500a..a6d2130 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -13,7 +13,7 @@
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
 Version:        204
-Release:        4%{?gitcommit:.git%{gitcommit}}%{?dist}
+Release:        5%{?gitcommit:.git%{gitcommit}}%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        A System and Service Manager
@@ -26,7 +26,7 @@ Source0:        http://www.freedesktop.org/software/systemd/%{name}-%{version}.t
 %endif
 # Fedora's default preset policy
 Source1:        90-default.preset
-Source5:        90-display-manager.preset
+Source5:        85-display-manager.preset
 # Feodora's SysV convert script. meh.
 Source2:        systemd-sysv-convert
 # 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/tmp.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-display-manager.preset
 %{_prefix}/lib/systemd/catalog/systemd.catalog
 %{_prefix}/lib/kernel/install.d/50-depmod.install
 %{_prefix}/lib/kernel/install.d/90-loaderentry.install
@@ -680,7 +680,6 @@ fi
 %{_datadir}/bash-completion/completions/udevadm
 %{_datadir}/bash-completion/completions/systemd-analyze
 
-
 # Make sure we don't remove runlevel targets from F14 alpha installs,
 # but make sure we don't create then anew.
 %ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel2.target
@@ -754,6 +753,9 @@ fi
 %{_libdir}/pkgconfig/gudev-1.0*
 
 %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
 - Fix kernel-install (#965897)