From 31acc428d9bfa04582ca7c5ec3580ef2b7aed172 Mon Sep 17 00:00:00 2001

From: Evgeny Vereshchagin <evvers@ya.ru>

Date: Wed, 17 Feb 2016 22:32:36 +0000

Subject: [PATCH] core: revert "core: resolve specifier in config_parse_exec()"

This reverts commit cb48dfca6a8bc15d9081651001a16bf51e03838a.

Exec*-settings resolve specifiers twice:

%%U -> config_parse_exec [cb48dfca6a8] -> %U -> service_spawn -> 0

Fixes #2637

(cherry picked from commit bd1b973fb326e9b7587494fd6108e5ded46e9163)

---

 src/core/load-fragment.c | 11 +----------

 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c

index b3dec7b8cc..8804b3ac41 100644

--- a/src/core/load-fragment.c

+++ b/src/core/load-fragment.c

@@ -574,9 +574,7 @@ int config_parse_exec(

                 void *data,

                 void *userdata) {

-        _cleanup_free_ char *cmd = NULL;

         ExecCommand **e = data;

-        Unit *u = userdata;

         const char *p;

         bool semicolon;

         int r;

@@ -585,7 +583,6 @@ int config_parse_exec(

         assert(lvalue);

         assert(rvalue);

         assert(e);

-        assert(u);

         e += ltype;

         rvalue += strspn(rvalue, WHITESPACE);

@@ -596,13 +593,7 @@ int config_parse_exec(

                 return 0;

         }

-        r = unit_full_printf(u, rvalue, &cmd);

-        if (r < 0) {

-                log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve unit specifiers on %s, ignoring: %m", rvalue);

-                return 0;

-        }

-

-        p = cmd;

+        p = rvalue;

         do {

                 _cleanup_free_ char *path = NULL, *firstword = NULL;

                 bool separate_argv0 = false, ignore = false;