anitazha / rpms / systemd

Forked from rpms/systemd 3 years ago
Clone

Blame SOURCES/0369-Revert-install-fix-disable-via-unit-file-path.patch

803fb7
From f79f65a2957cca23e0347eb2c9dfbd53be5c8dba Mon Sep 17 00:00:00 2001
803fb7
From: Michal Sekletar <msekleta@redhat.com>
803fb7
Date: Mon, 8 Aug 2016 15:15:14 +0200
803fb7
Subject: [PATCH] Revert "install: fix disable via unit file path"
803fb7
803fb7
This reverts commit 96df052a6a9d09cde2d437861727bf37fe6446b4.
803fb7
803fb7
Related: #1348208
803fb7
---
803fb7
 src/shared/install.c | 8 +++-----
803fb7
 1 file changed, 3 insertions(+), 5 deletions(-)
803fb7
803fb7
diff --git a/src/shared/install.c b/src/shared/install.c
803fb7
index f7f9866f4..9962508b1 100644
803fb7
--- a/src/shared/install.c
803fb7
+++ b/src/shared/install.c
803fb7
@@ -1910,12 +1910,10 @@ int unit_file_disable(
803fb7
                 return r;
803fb7
 
803fb7
         STRV_FOREACH(i, files) {
803fb7
+                if (!unit_name_is_valid(*i, UNIT_NAME_ANY))
803fb7
+                        return -EINVAL;
803fb7
 
803fb7
-                if (!is_path(*i))
803fb7
-                        r = install_info_add(&c, *i, NULL, NULL);
803fb7
-                else
803fb7
-                        r = install_info_add(&c, NULL, *i, NULL);
803fb7
-
803fb7
+                r = install_info_add(&c, *i, NULL, NULL);
803fb7
                 if (r < 0)
803fb7
                         return r;
803fb7
         }