From b7f33dca9e89e52089b512de61cd4cff4b78d66f Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Aug 15 2014 02:18:36 +0000
Subject: Revert bad patch


---

diff --git a/0153-Revert-systemctl-skip-native-unit-file-handling-if-s.patch b/0153-Revert-systemctl-skip-native-unit-file-handling-if-s.patch
new file mode 100644
index 0000000..6003c5a
--- /dev/null
+++ b/0153-Revert-systemctl-skip-native-unit-file-handling-if-s.patch
@@ -0,0 +1,33 @@
+From 105f345e6f6b7bfab55addf8fcbeb549a237eb1e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Thu, 14 Aug 2014 21:38:09 -0400
+Subject: [PATCH] Revert "systemctl: skip native unit file handling if sysv
+ file handling already handled everything"
+
+This patch only makes sense on top of patches which fix unit name
+mangling when --root is used, but those patches have not been
+cherry-picked for this branch.
+
+This reverts commit 3a02c6b4dc75987ef0938beae6fc48e8834aef5a.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1128308
+---
+ src/systemctl/systemctl.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
+index f18da82930..e9a7daabad 100644
+--- a/src/systemctl/systemctl.c
++++ b/src/systemctl/systemctl.c
+@@ -4232,11 +4232,6 @@ static int enable_unit(DBusConnection *bus, char **args) {
+         if (!args[1])
+                 return 0;
+ 
+-        /* If the operation was fully executed by the SysV compat,
+-         * let's finish early */
+-        if (strv_isempty(mangled_names))
+-                return 0;
+-
+         if (!bus || avoid_bus()) {
+                 if (streq(verb, "enable")) {
+                         r = unit_file_enable(arg_scope, arg_runtime, arg_root, args+1, arg_force, &changes, &n_changes);
diff --git a/systemd.spec b/systemd.spec
index cf5dcdb..ad1d711 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -22,7 +22,7 @@
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
 Version:        204
-Release:        20%{?gitcommit:.git%{gitcommit}}%{?dist}
+Release:        21%{?gitcommit:.git%{gitcommit}}%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        A System and Service Manager
@@ -198,6 +198,7 @@ Patch149:       0149-journal-compress-add-stream-compression-decompressio.patch
 Patch150:       0150-journal-compress-improve-xz-compression-performance.patch
 Patch151:       0151-socket-add-SocketUser-and-SocketGroup-for-chown-ing-.patch
 Patch152:       0152-socket-add-SocketUser-and-SocketGroup-for-chown-ing-.patch
+Patch153:       0153-Revert-systemctl-skip-native-unit-file-handling-if-s.patch
 
 # git diff --src-prefix=a/ --dst-prefix=b/ v204-stable..master -- hwdb/ > systemd-hwdb.patch
 Patch0999:      systemd-hwdb.patch
@@ -965,6 +966,9 @@ fi
 %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Thu Sep 14 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> 204-21
+- Fix regression in systemctl enable/disable (#1128308)
+
 * Tue Jul 22 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> 204-20
 - Update hardware database
 - Add SocketUser/SocketGroup (#1119282)