Add cgroup.pattern global configuration option

Signed-off-by: Christian Seiler <christian@iwakd.de>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

diff --git a/configure.ac b/configure.ac
index 5726057507400798abc136df7d8e0fc5f54e0d37..c734beae3c86d7dd8876fe9925a83e17fdcbe1ae 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -260,6 +260,12 @@ AC_ARG_WITH([rootfs-path],
                [--with-rootfs-path=dir],
                [lxc rootfs mount point]
        )], [], [with_rootfs_path=['${libdir}/lxc/rootfs']])
+# cgroup pattern specification
+AC_ARG_WITH([cgroup-pattern],
+       [AC_HELP_STRING(
+               [--with-cgroup-pattern=pattern],
+               [pattern for container cgroups]
+       )], [], [with_cgroup_pattern=['/lxc/%n']])
 
 # Container log path.  By default, use $lxcpath.
 AC_MSG_CHECKING([Whether to place logfiles in container config path])
@@ -303,6 +309,7 @@ AS_AC_EXPAND(LXCTEMPLATEDIR, "$datadir/lxc/templates")
 AS_AC_EXPAND(LXCHOOKDIR, "$datadir/lxc/hooks")
 AS_AC_EXPAND(LXCINITDIR, "$libexecdir")
 AS_AC_EXPAND(LOGPATH, "$with_log_path")
+AC_SUBST(DEFAULT_CGROUP_PATTERN, ["$with_cgroup_pattern"])
 
 # Check for some standard kernel headers
 AC_CHECK_HEADERS([linux/unistd.h linux/netlink.h linux/genetlink.h],

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index 35ec2a3a4fff46502ca7154a487eecd56d539d97..f19a9944f02b51981a07baf231aed463c043a01c 100644 (file)
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -100,7 +100,8 @@ AM_CFLAGS=-I$(top_srcdir)/src \
        -DLOGPATH=\"$(LOGPATH)\" \
        -DLXC_DEFAULT_CONFIG=\"$(LXC_DEFAULT_CONFIG)\" \
        -DLXC_USERNIC_DB=\"$(LXC_USERNIC_DB)\" \
-       -DLXC_USERNIC_CONF=\"$(LXC_USERNIC_CONF)\"
+       -DLXC_USERNIC_CONF=\"$(LXC_USERNIC_CONF)\" \
+       -DDEFAULT_CGROUP_PATTERN=\"$(DEFAULT_CGROUP_PATTERN)\"
 
 if ENABLE_APPARMOR
 AM_CFLAGS += -DHAVE_APPARMOR

diff --git a/src/lxc/utils.c b/src/lxc/utils.c
index fd892c16f658351c3de84c84e0331828ef3d3abf..36d80b9262d2f5338c7d188645b97addbbb23885 100644 (file)
--- a/src/lxc/utils.c
+++ b/src/lxc/utils.c
@@ -225,6 +225,7 @@ const char *lxc_global_config_value(const char *option_name)
                { "lvm_vg",          DEFAULT_VG      },
                { "zfsroot",         DEFAULT_ZFSROOT },
                { "lxcpath",         LXCPATH         },
+               { "cgroup.pattern",  DEFAULT_CGROUP_PATTERN },
                { NULL, NULL },
        };
        static const char *values[sizeof(options) / sizeof(options[0])] = { 0 };