b7f33d
From 105f345e6f6b7bfab55addf8fcbeb549a237eb1e Mon Sep 17 00:00:00 2001
b7f33d
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
b7f33d
Date: Thu, 14 Aug 2014 21:38:09 -0400
b7f33d
Subject: [PATCH] Revert "systemctl: skip native unit file handling if sysv
b7f33d
 file handling already handled everything"
b7f33d
b7f33d
This patch only makes sense on top of patches which fix unit name
b7f33d
mangling when --root is used, but those patches have not been
b7f33d
cherry-picked for this branch.
b7f33d
b7f33d
This reverts commit 3a02c6b4dc75987ef0938beae6fc48e8834aef5a.
b7f33d
b7f33d
https://bugzilla.redhat.com/show_bug.cgi?id=1128308
b7f33d
---
b7f33d
 src/systemctl/systemctl.c | 5 -----
b7f33d
 1 file changed, 5 deletions(-)
b7f33d
b7f33d
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
b7f33d
index f18da82930..e9a7daabad 100644
b7f33d
--- a/src/systemctl/systemctl.c
b7f33d
+++ b/src/systemctl/systemctl.c
b7f33d
@@ -4232,11 +4232,6 @@ static int enable_unit(DBusConnection *bus, char **args) {
b7f33d
         if (!args[1])
b7f33d
                 return 0;
b7f33d
 
b7f33d
-        /* If the operation was fully executed by the SysV compat,
b7f33d
-         * let's finish early */
b7f33d
-        if (strv_isempty(mangled_names))
b7f33d
-                return 0;
b7f33d
-
b7f33d
         if (!bus || avoid_bus()) {
b7f33d
                 if (streq(verb, "enable")) {
b7f33d
                         r = unit_file_enable(arg_scope, arg_runtime, arg_root, args+1, arg_force, &changes, &n_changes);