chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
backlight: add minimal tool to save/restore screen brightness across reboots
[elogind.git]
/
src
/
core
/
unit-printf.c
diff --git
a/src/core/unit-printf.c
b/src/core/unit-printf.c
index 85a05b872a450889d91a7705e04912ccc5354e41..ffc203dd921163ecdc03dda39f93bee8020de5f6 100644
(file)
--- a/
src/core/unit-printf.c
+++ b/
src/core/unit-printf.c
@@
-27,6
+27,8
@@
#include "unit-name.h"
#include "unit-printf.h"
#include "macro.h"
#include "unit-name.h"
#include "unit-printf.h"
#include "macro.h"
+#include "cgroup-util.h"
+#include "special.h"
static char *specifier_prefix_and_instance(char specifier, void *data, void *userdata) {
Unit *u = userdata;
static char *specifier_prefix_and_instance(char specifier, void *data, void *userdata) {
Unit *u = userdata;
@@
-86,22
+88,22
@@
static char *specifier_cgroup(char specifier, void *data, void *userdata) {
}
static char *specifier_cgroup_root(char specifier, void *data, void *userdata) {
}
static char *specifier_cgroup_root(char specifier, void *data, void *userdata) {
+ _cleanup_free_ char *p = NULL;
Unit *u = userdata;
Unit *u = userdata;
- c
har *p
;
-
assert(u)
;
+ c
onst char *slice
;
+
int r
;
- if (specifier == 'r')
- return strdup(u->manager->cgroup_hierarchy);
+ assert(u);
- if (path_get_parent(u->manager->cgroup_hierarchy, &p) < 0)
- return strdup("");
+ slice = unit_slice_name(u);
+ if (specifier == 'R' || !slice)
+ return strdup(u->manager->cgroup_root);
- if (streq(p, "/")) {
- free(p);
- return strdup("");
- }
+ r = cg_slice_to_path(slice, &p);
+ if (r < 0)
+ return NULL;
- return
p
;
+ return
strjoin(u->manager->cgroup_root, "/", p, NULL)
;
}
static char *specifier_runtime(char specifier, void *data, void *userdata) {
}
static char *specifier_runtime(char specifier, void *data, void *userdata) {
@@
-256,8
+258,8
@@
char *unit_full_printf(Unit *u, const char *format) {
*
* %f the the instance if set, otherwise the id
* %c cgroup path of unit
*
* %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")
+ * %r
where units in this slice are place in the cgroup tree
+ * %R
the root of this systemd's instance tree
* %t the runtime directory to place sockets in (e.g. "/run" or $XDG_RUNTIME_DIR)
* %U the UID of the configured user or running user
* %u the username of the configured user or running user
* %t the runtime directory to place sockets in (e.g. "/run" or $XDG_RUNTIME_DIR)
* %U the UID of the configured user or running user
* %u the username of the configured user or running user
@@
-266,6
+268,7
@@
char *unit_full_printf(Unit *u, const char *format) {
* %m the machine ID of the running system
* %H the host name of the running system
* %b the boot ID of the running system
* %m the machine ID of the running system
* %H the host name of the running system
* %b the boot ID of the running system
+ * %v `uname -r` of the running system
*/
const Specifier table[] = {
*/
const Specifier table[] = {
@@
-289,7
+292,8
@@
char *unit_full_printf(Unit *u, const char *format) {
{ 'm', specifier_machine_id, NULL },
{ 'H', specifier_host_name, NULL },
{ 'b', specifier_boot_id, NULL },
{ 'm', specifier_machine_id, NULL },
{ 'H', specifier_host_name, NULL },
{ 'b', specifier_boot_id, NULL },
- { 0, NULL, NULL }
+ { 'v', specifier_kernel_release, NULL },
+ {}
};
assert(format);
};
assert(format);