cgroups: move cgroup files to common subfolder

Signed-off-by: Christian Brauner <cbrauner@suse.de>

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index 5078b5c8ada4d2a427aa9c7073ee2b6285221b22..9a87c152aa1371cbcb171094b7a3b1d48f418389 100644 (file)
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -17,8 +17,8 @@ noinst_HEADERS = \
        bdev/lxcrbd.h \
        bdev/lxcrsync.h \
        bdev/lxczfs.h \
+       cgroups/cgroup.h \
        caps.h \
-       cgroup.h \
        conf.h \
        console.h \
        error.h \
@@ -80,6 +80,9 @@ liblxc_so_SOURCES = \
        bdev/lxcrbd.c bdev/lxcrbd.h \
        bdev/lxcrsync.c bdev/lxcrsync.h \
        bdev/lxczfs.c bdev/lxczfs.h \
+       cgroups/cgfs.c \
+       cgroups/cgfsng.c \
+       cgroups/cgroup.c cgroups/cgroup.h \
        commands.c commands.h \
        start.c start.h \
        execute.c \
@@ -88,9 +91,6 @@ liblxc_so_SOURCES = \
        freezer.c \
        error.h error.c \
        parse.c parse.h \
-       cgfs.c \
-       cgfsng.c \
-       cgroup.c cgroup.h \
        lxc.h \
        initutils.c initutils.h \
        utils.c utils.h \
@@ -122,7 +122,7 @@ liblxc_so_SOURCES = \
        $(LSM_SOURCES)
 
 if ENABLE_CGMANAGER
-liblxc_so_SOURCES += cgmanager.c
+liblxc_so_SOURCES += cgroups/cgmanager.c
 endif
 
 if IS_BIONIC
@@ -154,7 +154,8 @@ AM_CFLAGS=-DLXCROOTFSMOUNT=\"$(LXCROOTFSMOUNT)\" \
        -DSBINDIR=\"$(SBINDIR)\" \
        -I $(top_srcdir)/src \
        -I $(top_srcdir)/src/lxc \
-       -I $(top_srcdir)/src/lxc/bdev
+       -I $(top_srcdir)/src/lxc/bdev \
+       -I $(top_srcdir)/src/lxc/cgroups
 
 if ENABLE_APPARMOR
 AM_CFLAGS += -DHAVE_APPARMOR

diff --git a/src/lxc/cgfs.c b/src/lxc/cgroups/cgfs.c
similarity index 100%
rename from src/lxc/cgfs.c
rename to src/lxc/cgroups/cgfs.c

diff --git a/src/lxc/cgfsng.c b/src/lxc/cgroups/cgfsng.c
similarity index 100%
rename from src/lxc/cgfsng.c
rename to src/lxc/cgroups/cgfsng.c

diff --git a/src/lxc/cgmanager.c b/src/lxc/cgroups/cgmanager.c
similarity index 100%
rename from src/lxc/cgmanager.c
rename to src/lxc/cgroups/cgmanager.c

diff --git a/src/lxc/cgroup.c b/src/lxc/cgroups/cgroup.c
similarity index 100%
rename from src/lxc/cgroup.c
rename to src/lxc/cgroups/cgroup.c

diff --git a/src/lxc/cgroup.h b/src/lxc/cgroups/cgroup.h
similarity index 100%
rename from src/lxc/cgroup.h
rename to src/lxc/cgroups/cgroup.h