summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-09-18 11:18:37 +0200
committerLennart Poettering <lennart@poettering.net>2012-09-18 11:18:37 +0200
commit99006251161aee07b6a099e3186b4360be66eeaa (patch)
tree2544e697dc206d76d1ef36557f9474c78f9e4ee6 /src
parentc198300fc44cdc62b43d7458ab9278b9c46fd733 (diff)
unit: fix %f resolving
Diffstat (limited to 'src')
-rw-r--r--src/core/unit.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/core/unit.c b/src/core/unit.c
index be0d654bbc..655440113c 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -2263,7 +2263,7 @@ static char *specifier_filename(char specifier, void *data, void *userdata) {
if (u->instance)
return unit_name_path_unescape(u->instance);
- return unit_name_to_path(u->instance);
+ return unit_name_to_path(u->id);
}
static char *specifier_cgroup(char specifier, void *data, void *userdata) {
@@ -2404,12 +2404,14 @@ char *unit_full_printf(Unit *u, const char *format) {
/* This is similar to unit_name_printf() but also supports
* unescaping. Also, adds a couple of additional codes:
*
+ * %f the the instance if set, otherwise the id
* %c cgroup path of unit
* %r root cgroup path of this systemd instance (e.g. "/user/lennart/shared/systemd-4711")
* %R parent of root cgroup path (e.g. "/usr/lennart/shared")
* %t the runtime directory to place sockets in (e.g. "/run" or $XDG_RUNTIME_DIR)
- * %u the username of the configured User or running user
- * %h the homedir of the configured User or running user
+ * %u the username of the configured user or running user
+ * %h the homedir of the configured user or running user
+ * %s the shell of the configured user or running user
*/
const Specifier table[] = {
@@ -2419,6 +2421,7 @@ char *unit_full_printf(Unit *u, const char *format) {
{ 'P', specifier_prefix_unescaped, NULL },
{ 'i', specifier_string, u->instance },
{ 'I', specifier_instance_unescaped, NULL },
+
{ 'f', specifier_filename, NULL },
{ 'c', specifier_cgroup, NULL },
{ 'r', specifier_cgroup_root, NULL },