summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2019-08-20 17:32:34 +0200
committerLennart Poettering <lennart@poettering.net>2019-08-20 17:32:34 +0200
commit4a8daee72f8b1e86cbd28c1f5345db3788dee28b (patch)
treea9ca92e0ae18a96827d118be045ecfe381f7aba9
parentd5a1c99b25e549f44ca6f5f8006b90ee56b809f9 (diff)
downloadsystemd-4a8daee72f8b1e86cbd28c1f5345db3788dee28b.tar.gz
load-fragment: use path_join() where appropriate
-rw-r--r--src/core/load-fragment.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 20079e1fb1..c7827df95d 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -98,14 +98,12 @@ int parse_confirm_spawn(const char *value, char **console) {
if (r == 0) {
*console = NULL;
return 0;
- }
-
- if (r > 0) /* on with default tty */
+ } else if (r > 0) /* on with default tty */
s = strdup("/dev/console");
else if (is_path(value)) /* on with fully qualified path */
s = strdup(value);
else /* on with only a tty file name, not a fully qualified path */
- s = strjoin("/dev/", value);
+ s = path_join("/dev/", value);
if (!s)
return -ENOMEM;