chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
man: document luks.options kernel commandline
[elogind.git]
/
src
/
cgls
/
cgls.c
diff --git
a/src/cgls/cgls.c
b/src/cgls/cgls.c
index f232731ab49527b6f6f6163310b02197e0444911..c3229ad2d3dbca66dc7c21c3d088423dd9d78bc5 100644
(file)
--- a/
src/cgls/cgls.c
+++ b/
src/cgls/cgls.c
@@
-34,6
+34,7
@@
#include "pager.h"
#include "build.h"
#include "output-mode.h"
#include "pager.h"
#include "build.h"
#include "output-mode.h"
+#include "fileio.h"
static bool arg_no_pager = false;
static bool arg_kernel_threads = false;
static bool arg_no_pager = false;
static bool arg_kernel_threads = false;
@@
-77,7
+78,7
@@
static int parse_argv(int argc, char *argv[]) {
assert(argc >= 1);
assert(argv);
assert(argc >= 1);
assert(argv);
- while ((c = getopt_long(argc, argv, "hkaM:", options, NULL)) >= 0) {
+ while ((c = getopt_long(argc, argv, "hka
l
M:", options, NULL)) >= 0) {
switch (c) {
switch (c) {
@@
-184,9
+185,11
@@
int main(int argc, char *argv[]) {
r = show_cgroup_by_path(p, NULL, 0,
arg_kernel_threads, output_flags);
} else {
r = show_cgroup_by_path(p, NULL, 0,
arg_kernel_threads, output_flags);
} else {
- if (arg_machine)
- r = cg_get_machine_path(arg_machine, &root);
- else
+ if (arg_machine) {
+ char *m;
+ m = strappenda("/run/systemd/machines/", arg_machine);
+ r = parse_env_file(m, NEWLINE, "CGROUP", &root, NULL);
+ } else
r = cg_get_root_path(&root);
if (r < 0) {
log_error("Failed to get %s path: %s",
r = cg_get_root_path(&root);
if (r < 0) {
log_error("Failed to get %s path: %s",