diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 043c4ed16e..ab7613dcc4 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -1272,10 +1272,25 @@
%t
- Runtime directory
+ Runtime directory root
This is either /run (for the system manager) or the path $XDG_RUNTIME_DIR resolves to (for user managers).
+ %S
+ State directory root
+ This is either /var/lib (for the system manager) or the path $XDG_CONFIG_HOME resolves to (for user managers).
+
+
+ %C
+ Cache directory root
+ This is either /var/cache (for the system manager) or the path $XDG_CACHE_HOME resolves to (for user managers).
+
+
+ %L
+ Logs directory root
+ This is either /var/log (for the system manager) or the path $XDG_CONFIG_HOME resolves to with /log appended (for user managers).
+
+
%u
User name
This is the name of the user running the service manager instance. In case of the system manager this resolves to root.
diff --git a/src/core/unit-printf.c b/src/core/unit-printf.c
index 0480ec6526..8088d016a3 100644
--- a/src/core/unit-printf.c
+++ b/src/core/unit-printf.c
@@ -143,13 +143,13 @@ static int specifier_cgroup_slice(char specifier, void *data, void *userdata, ch
return 0;
}
-static int specifier_runtime(char specifier, void *data, void *userdata, char **ret) {
+static int specifier_special_directory(char specifier, void *data, void *userdata, char **ret) {
Unit *u = userdata;
char *n = NULL;
assert(u);
- n = strdup(u->manager->prefix[EXEC_DIRECTORY_RUNTIME]);
+ n = strdup(u->manager->prefix[PTR_TO_UINT(data)]);
if (!n)
return -ENOMEM;
@@ -244,10 +244,15 @@ int unit_full_printf(Unit *u, const char *format, char **ret) {
* (which are likely not suitable for unescaped inclusion in unit names):
*
* %f: the unescaped instance if set, otherwise the id unescaped as path
+ *
* %c: cgroup path of unit (deprecated)
* %r: where units in this slice are placed in the cgroup tree (deprecated)
* %R: the root of this systemd's instance tree (deprecated)
- * %t: the runtime directory to place sockets in (e.g. "/run" or $XDG_RUNTIME_DIR)
+ *
+ * %t: the runtime directory root (e.g. /run or $XDG_RUNTIME_DIR)
+ * %S: the state directory root (e.g. /var/lib or $XDG_CONFIG_HOME)
+ * %C: the cache directory root (e.g. /var/cache or $XDG_CACHE_HOME)
+ * %L: the log directory root (e.g. /var/log or $XDG_CONFIG_HOME/log)
*
* %h: the homedir of the running user
* %s: the shell of the running user
@@ -271,7 +276,10 @@ int unit_full_printf(Unit *u, const char *format, char **ret) {
{ 'c', specifier_cgroup, NULL },
{ 'r', specifier_cgroup_slice, NULL },
{ 'R', specifier_cgroup_root, NULL },
- { 't', specifier_runtime, NULL },
+ { 't', specifier_special_directory, UINT_TO_PTR(EXEC_DIRECTORY_RUNTIME) },
+ { 'S', specifier_special_directory, UINT_TO_PTR(EXEC_DIRECTORY_STATE) },
+ { 'C', specifier_special_directory, UINT_TO_PTR(EXEC_DIRECTORY_CACHE) },
+ { 'L', specifier_special_directory, UINT_TO_PTR(EXEC_DIRECTORY_LOGS) },
{ 'U', specifier_user_id, NULL },
{ 'u', specifier_user_name, NULL },