From d6c21f703a4cd9532b4095ead180c86a994df985 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 12 Aug 2010 17:21:58 +0200 Subject: [PATCH] Fix https://bugzilla.redhat.com/show_bug.cgi?id=623561 --- 0001-unit-move-prefdm-after-livesys.patch | 26 +++++++++++++++++++++++ systemd.spec | 15 ++++++++----- 2 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 0001-unit-move-prefdm-after-livesys.patch diff --git a/0001-unit-move-prefdm-after-livesys.patch b/0001-unit-move-prefdm-after-livesys.patch new file mode 100644 index 0000000..3a06e89 --- /dev/null +++ b/0001-unit-move-prefdm-after-livesys.patch @@ -0,0 +1,26 @@ +From 145b66acab96f3a51696e8402d8cb21153868d7c Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Thu, 12 Aug 2010 17:14:20 +0200 +Subject: [PATCH] unit: move prefdm after livesys + +https://bugzilla.redhat.com/show_bug.cgi?id=623561 +--- + units/fedora/prefdm.service | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/units/fedora/prefdm.service b/units/fedora/prefdm.service +index 49c06a6..233e00d 100644 +--- a/units/fedora/prefdm.service ++++ b/units/fedora/prefdm.service +@@ -7,7 +7,7 @@ + + [Unit] + Description=Display Manager +-After=syslog.target haldaemon.service ++After=syslog.target haldaemon.service livesys-late.service + + # On Fedora gdm/X11 is on tty1. We explicitly cancel the getty here to + # avoid any races around that. +-- +1.7.0.1 + diff --git a/systemd.spec b/systemd.spec index 1d709be..213f96d 100644 --- a/systemd.spec +++ b/systemd.spec @@ -2,7 +2,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Version: 7 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Base Summary: A System and Session Manager @@ -28,7 +28,8 @@ Requires: initscripts Requires: selinux-policy >= 3.8.7 Source0: http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.bz2 -Patch0: 0001-plymouth-call-plymouth-quit-before-running-the-getty.patch +Patch0: 0001-plymouth-call-plymouth-quit-before-running-the-getty.patch +Patch1: 0001-unit-move-prefdm-after-livesys.patch %description systemd is a system and session manager for Linux, compatible with @@ -79,6 +80,7 @@ Drop-in replacement for the System V init tools of systemd. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %configure --with-rootdir= --with-distro=fedora @@ -229,7 +231,10 @@ fi %{_mandir}/man8/runlevel.* %changelog -* Thu Aug 12 2010 Lennart Poettering - 7-2 +* Thu Aug 12 2010 Lennart Poettering - 7-3 +- Fix https://bugzilla.redhat.com/show_bug.cgi?id=623561 + +* Thu Aug 12 2010 Lennart Poettering - 7-2 - Fix https://bugzilla.redhat.com/show_bug.cgi?id=623430 * Tue Aug 10 2010 Lennart Poettering - 7-1 @@ -261,10 +266,10 @@ fi * Sat Jul 24 2010 Lennart Poettering - 4-1 - New upstream release, and make default -* Tue Jul 13 2010 Lennart Poettering - 3-3 +* Tue Jul 13 2010 Lennart Poettering - 3-3 - Used wrong tarball -* Tue Jul 13 2010 Lennart Poettering - 3-2 +* Tue Jul 13 2010 Lennart Poettering - 3-2 - Own /cgroup jointly with libcgroup, since we don't dpend on it anymore * Tue Jul 13 2010 Lennart Poettering - 3-1