From 865baae3de3ff2485a0dbe567758cf90e64bdd2a Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sep 21 2012 21:56:45 +0000 Subject: new upstream release --- diff --git a/90-default.preset b/90-default.preset index 58a92e3..4ca793a 100644 --- a/90-default.preset +++ b/90-default.preset @@ -69,7 +69,6 @@ enable xenconsoled.service enable accounts-daemon.service enable rtkit-daemon.service enable upower.service -enable gdm.service enable udisks2.service enable polkit.service enable packagekit-offline-update.service diff --git a/90-display-manager.preset b/90-display-manager.preset new file mode 100644 index 0000000..c1d3069 --- /dev/null +++ b/90-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/sources b/sources index e21ceae..4ab5444 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8b5750f0c57fb35bf2046ad42ba149d1 systemd-190.tar.xz +a5e4bfaf900a9e2480827feaf58556cb systemd-191.tar.xz diff --git a/systemd.spec b/systemd.spec index 4d4eac1..cc4a082 100644 --- a/systemd.spec +++ b/systemd.spec @@ -21,7 +21,7 @@ Url: http://www.freedesktop.org/wiki/Software/systemd # AGAIN: DO NOT BLINDLY UPDATE RAWHIDE PACKAGES TOO WHEN YOU UPDATE # THIS PACKAGE FOR A NON-RAWHIDE DEVELOPMENT DISTRIBUTION! -Version: 190 +Version: 191 Release: 1%{?gitcommit:.git%{gitcommit}}%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ @@ -73,6 +73,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 # Feodora's SysV convert script. meh. Source2: systemd-sysv-convert # Stop-gap, just to ensure things work out-of-the-box for this driver. @@ -254,6 +255,7 @@ glib-based applications using libudev functionality. /usr/bin/mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-preset/ /usr/bin/mkdir -p %{buildroot}%{_prefix}/lib/systemd/user-preset/ /usr/bin/install -m 0644 %{SOURCE1} %{buildroot}%{_prefix}/lib/systemd/system-preset/ +/usr/bin/install -m 0644 %{SOURCE5} %{buildroot}%{_prefix}/lib/systemd/system-preset/ # Make sure the shutdown/sleep drop-in dirs exist /usr/bin/mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-shutdown/ @@ -479,6 +481,7 @@ fi %{_prefix}/lib/tmpfiles.d/legacy.conf %{_prefix}/lib/tmpfiles.d/tmp.conf %{_prefix}/lib/systemd/system-preset/90-default.preset +%{_prefix}/lib/systemd/system-preset/90-display-manager.preset %{_sbindir}/init %{_sbindir}/reboot %{_sbindir}/halt @@ -577,6 +580,10 @@ fi %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Fri Sep 21 2012 Lennart Poettering - 191-1 +- New upstream release +- Enable all display managers by default, as discussed with Adam Williamson + * Thu Sep 20 2012 Lennart Poettering - 190-1 - New upstream release - Take possession of /etc/localtime, and remove /etc/sysconfig/clock