diff --git a/0001-unit-fix-complementing-of-requirement-deps-with-Afte.patch b/0001-unit-fix-complementing-of-requirement-deps-with-Afte.patch new file mode 100644 index 0000000..7e6b8c4 --- /dev/null +++ b/0001-unit-fix-complementing-of-requirement-deps-with-Afte.patch @@ -0,0 +1,33 @@ +From a65cb51f29ee177f6f800c87232b68475216a418 Mon Sep 17 00:00:00 2001 +From: Michal Schmidt +Date: Fri, 23 Sep 2011 13:58:00 +0200 +Subject: [PATCH] unit: fix complementing of requirement deps with After deps + for targets + +'man systemd.target' says: + Unless DefaultDependencies= is set to false, target units will + implicitly complement all configured dependencies of type + Wants=, Requires=, RequiresOverridable= with dependencies of type + After= if the units in question also have DefaultDependencies=true. + +It did not work because of a forgotten negation. +--- + src/unit.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/unit.c b/src/unit.c +index 0b435cb..903a8e4 100644 +--- a/src/unit.c ++++ b/src/unit.c +@@ -774,7 +774,7 @@ int unit_add_default_target_dependency(Unit *u, Unit *target) { + /* If either side wants no automatic dependencies, then let's + * skip this */ + if (!u->meta.default_dependencies || +- target->meta.default_dependencies) ++ !target->meta.default_dependencies) + return 0; + + /* Don't create loops */ +-- +1.7.4.4 + diff --git a/systemd.spec b/systemd.spec index ccb4055..1c88aa1 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: 36 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Base Summary: A System and Service Manager @@ -44,6 +44,8 @@ Source1: macros.systemd Source2: systemd-sysv-convert # Stop-gap, just to ensure things work out-of-the-box for this driver. Source3: udlfb.conf +# We revert this one for https://bugzilla.redhat.com/show_bug.cgi?id=741078 +Patch0: 0001-unit-fix-complementing-of-requirement-deps-with-Afte.patch # For sysvinit tools Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24 @@ -106,6 +108,7 @@ SysV compatibility tools for systemd %prep %setup -q +%patch0 -p1 -R %build %configure --with-rootdir= --with-distro=fedora --with-rootlibdir=/%{_lib} @@ -350,6 +353,10 @@ fi %{_bindir}/systemd-sysv-convert %changelog +* Sun Sep 25 2011 Michal Schmidt - 36-3 +- Revert an upstream patch that caused ordering cycles +- Resolves: #741078 + * Fri Sep 23 2011 Lennart Poettering - 36-2 - Add /etc/timezone to ghosted files