From: Harald Hoyer <harald@redhat.com>
Date: Fri, 20 Jul 2012 07:11:53 +0000 (+0200)
Subject: Turn on systemd again and Conflict < systemd-187
X-Git-Tag: 021~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c008b0ce102c63c1c94486b072397ee69612736d;p=thirdparty%2Fdracut.git

Turn on systemd again and Conflict < systemd-187
---

diff --git a/dracut.conf.d/fedora.conf.example b/dracut.conf.d/fedora.conf.example
index 012bdd6c5..4cb1890a7 100644
--- a/dracut.conf.d/fedora.conf.example
+++ b/dracut.conf.d/fedora.conf.example
@@ -9,5 +9,5 @@ prefix="/"
 systemdutildir=/usr/lib/systemd
 systemdsystemunitdir=/usr/lib/systemd/system
 udevdir=/usr/lib/udev
-#add_dracutmodules+=" systemd "
+add_dracutmodules+=" systemd "
 realinitpath="/usr/lib/systemd/systemd"
diff --git a/dracut.spec b/dracut.spec
index 78de2f3ec..25e48a2f1 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -84,7 +84,7 @@ Requires: file
 Requires: udev > 166
 %if 0%{?fedora} || 0%{?rhel} > 6
 Requires: util-linux >= 2.21
-#Conflicts: systemd <= 187
+Conflicts: systemd < 187
 %else
 Requires: util-linux-ng >= 2.21
 %endif