Attachment 47247 Details for Bug 37455 – systemctl is-enabled patch

[patch] systemctl is-enabled patch

is-enabled.patch (text/plain), 1.22 KB, created by Stephen Haynes on 2011-05-28 02:13:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stephen Haynes

Created: 2011-05-28 02:13:20 UTC

Size: 1.22 KB

patch

obsolete

>diff --git a/src/systemctl.c b/src/systemctl.c
>index 99ada38..33742ef 100644
>--- a/src/systemctl.c
>+++ b/src/systemctl.c
>@@ -4159,14 +4159,6 @@ static int install_info_apply(const char *verb, LookupPaths *paths, InstallInfo
>                 return -ENOENT;
>         }
> 
>-        /* Consider unit files stored in /lib and /usr always enabled
>-         * if they have no [Install] data. */
>-        if (streq(verb, "is-enabled") &&
>-            strv_isempty(i->aliases) &&
>-            strv_isempty(i->wanted_by) &&
>-            !path_startswith(filename, "/etc"))
>-                return 1;
>-
>         i->path = filename;
> 
>         if ((r = config_parse(filename, f, NULL, items, true, i)) < 0) {
>@@ -4179,6 +4171,14 @@ static int install_info_apply(const char *verb, LookupPaths *paths, InstallInfo
> 
>         fclose(f);
> 
>+        /* Consider unit files stored in /lib and /usr always enabled
>+         * if they have no [Install] data. */
>+        if (streq(verb, "is-enabled") &&
>+            strv_isempty(i->aliases) &&
>+            strv_isempty(i->wanted_by) &&
>+            !path_startswith(filename, "/etc"))
>+                return 1;
>+
>         if ((r = install_info_symlink_alias(verb, i, config_path)) != 0)
>                 return r;
>

Actions: View | Splinter Review

Attachments on bug 37455: 47247

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.