[systemd-commits] Makefile.am man/sd_booted.xml man/systemd-cgls.xml man/systemd.xml src/cgls.c src/cgroup-util.c src/mount-setup.c src/sd-daemon.c src/test-cgroup.c
Lennart Poettering
lennart at kemper.freedesktop.org
Tue Aug 24 19:59:07 PDT 2010
Makefile.am | 2 --
man/sd_booted.xml | 6 +++---
man/systemd-cgls.xml | 2 +-
man/systemd.xml | 2 +-
src/cgls.c | 2 +-
src/cgroup-util.c | 4 ++--
src/mount-setup.c | 18 +++++++++---------
src/sd-daemon.c | 4 ++--
src/test-cgroup.c | 2 +-
9 files changed, 20 insertions(+), 22 deletions(-)
New commits:
commit 77d5f105bf63330350c7bddacdeda914f945590f
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Aug 25 04:58:16 2010 +0200
cgroup: mount cgroup file systems to /sys/fs/cgroup instead of /cgroup
This requires the /sys/fs/cgroup to exist. Current git kernels have
this, released kernels need a backport of a single patch.
diff --git a/Makefile.am b/Makefile.am
index 859d332..725685d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -847,8 +847,6 @@ install-data-hook:
$(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants \
$(DESTDIR)$(pkgsysconfdir)/session \
$(DESTDIR)$(sysconfdir)/xdg/systemd
- $(MKDIR_P) -m 0755 $(DESTDIR)/cgroup || \
- echo "Don't forget to create /cgroup! Couldn't create it for you, continuing anyway."
( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
rm -f session && \
$(LN_S) $(pkgsysconfdir)/session session )
diff --git a/man/sd_booted.xml b/man/sd_booted.xml
index 15cd6ce..841ee1d 100644
--- a/man/sd_booted.xml
+++ b/man/sd_booted.xml
@@ -85,11 +85,11 @@
implementation.</para>
<para>Internally, this function checks whether the
- <filename>/cgroup/systemd</filename> virtual file
+ <filename>/sys/fs/cgroup/systemd</filename> virtual file
system is mounted, by comparing the st_dev value of
the <function>stat()</function> data of
- <filename>/cgroup</filename> and
- <filename>/cgroup/systemd</filename>.</para>
+ <filename>/sys/fs/cgroup</filename> and
+ <filename>/sys/fs/cgroup/systemd</filename>.</para>
<para>For details about the algorithm check the
liberally licensed reference implementation sources:
diff --git a/man/systemd-cgls.xml b/man/systemd-cgls.xml
index da3e0ca..8546e39 100644
--- a/man/systemd-cgls.xml
+++ b/man/systemd-cgls.xml
@@ -65,7 +65,7 @@
file paths or are assumed in the systemd control group
hierarchy. If no argument is specified and the current
working directory is beneath the control group mount
- point <filename>/cgroup</filename> shows the contents
+ point <filename>/sys/fs/cgroup</filename> shows the contents
of the control group the working directory refers
to. Otherwise the full systemd control group hierarchy
is shown.</para>
diff --git a/man/systemd.xml b/man/systemd.xml
index 6edce49..edd824d 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -388,7 +388,7 @@
track of processes. Control group information is
maintained in the kernel, and is accessible via the
file system hierarchy (beneath
- <filename>/cgroup/systemd/</filename>), or in tools
+ <filename>/sys/fs/cgroup/systemd/</filename>), or in tools
such as
<citerefentry><refentrytitle>ps</refentrytitle><manvolnum>1</manvolnum></citerefentry>
(<command>ps xawf -eo pid,user,cgroup,args</command>
diff --git a/src/cgls.c b/src/cgls.c
index 2940e37..f1f3046 100644
--- a/src/cgls.c
+++ b/src/cgls.c
@@ -103,7 +103,7 @@ int main(int argc, char *argv[]) {
goto finish;
}
- if (path_startswith(p, "/cgroup")) {
+ if (path_startswith(p, "/sys/fs/cgroup")) {
printf("Working Directory %s:\n", p);
r = show_cgroup_by_path(p, NULL, 0);
} else
diff --git a/src/cgroup-util.c b/src/cgroup-util.c
index 07e4e64..6abb6b5 100644
--- a/src/cgroup-util.c
+++ b/src/cgroup-util.c
@@ -481,7 +481,7 @@ int cg_get_path(const char *controller, const char *path, const char *suffix, ch
else
p = controller;
- if (asprintf(&mp, "/cgroup/%s", p) < 0)
+ if (asprintf(&mp, "/sys/fs/cgroup/%s", p) < 0)
return -ENOMEM;
if ((r = path_is_mount_point(mp)) <= 0) {
@@ -927,7 +927,7 @@ int cg_fix_path(const char *path, char **result) {
/* First check if it already is a filesystem path */
if (path_is_absolute(path) &&
- path_startswith(path, "/cgroup") &&
+ path_startswith(path, "/sys/fs/cgroup") &&
access(path, F_OK) >= 0) {
if (!(t = strdup(path)))
diff --git a/src/mount-setup.c b/src/mount-setup.c
index 8b4d8c7..c1ddbe4 100644
--- a/src/mount-setup.c
+++ b/src/mount-setup.c
@@ -42,13 +42,13 @@ typedef struct MountPoint {
} MountPoint;
static const MountPoint mount_table[] = {
- { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
- { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
- { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID, true },
- { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
- { "devpts", "/dev/pts", "devpts", NULL, MS_NOSUID|MS_NOEXEC, false },
- { "tmpfs", "/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
- { "cgroup", "/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
+ { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
+ { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
+ { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID, true },
+ { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
+ { "devpts", "/dev/pts", "devpts", NULL, MS_NOSUID|MS_NOEXEC, false },
+ { "tmpfs", "/sys/fs/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
+ { "cgroup", "/sys/fs/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
};
/* These are API file systems that might be mounted by other software,
@@ -75,7 +75,7 @@ bool mount_point_is_api(const char *path) {
if (path_equal(path, ignore_paths[i]))
return true;
- return path_startswith(path, "/cgroup/");
+ return path_startswith(path, "/sys/fs/cgroup/");
}
static int mount_one(const MountPoint *p) {
@@ -138,7 +138,7 @@ static int mount_cgroup_controllers(void) {
goto finish;
}
- if (asprintf(&where, "/cgroup/%s", controller) < 0) {
+ if (asprintf(&where, "/sys/fs/cgroup/%s", controller) < 0) {
free(controller);
r = -ENOMEM;
goto finish;
diff --git a/src/sd-daemon.c b/src/sd-daemon.c
index 33970f6..9b4e010 100644
--- a/src/sd-daemon.c
+++ b/src/sd-daemon.c
@@ -441,10 +441,10 @@ int sd_booted(void) {
/* We simply test whether the systemd cgroup hierarchy is
* mounted */
- if (lstat("/cgroup", &a) < 0)
+ if (lstat("/sys/fs/cgroup", &a) < 0)
return 0;
- if (lstat("/cgroup/systemd", &b) < 0)
+ if (lstat("/sys/fs/cgroup/systemd", &b) < 0)
return 0;
return a.st_dev != b.st_dev;
diff --git a/src/test-cgroup.c b/src/test-cgroup.c
index bebca7b..63329a3 100644
--- a/src/test-cgroup.c
+++ b/src/test-cgroup.c
@@ -53,7 +53,7 @@ int main(int argc, char*argv[]) {
free(path);
assert_se(cg_get_path(SYSTEMD_CGROUP_CONTROLLER, "/test-b/test-d", NULL, &path) == 0);
- assert_se(path_equal(path, "/cgroup/systemd/test-b/test-d"));
+ assert_se(path_equal(path, "/sys/fs/cgroup/systemd/test-b/test-d"));
free(path);
assert_se(cg_is_empty(SYSTEMD_CGROUP_CONTROLLER, "/test-a", false) > 0);
More information about the systemd-commits
mailing list