remove mountcgroup hook entirely

Also fix the comment in lxc-cirros template (which I overlooked last time). Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> Acked-by: Stéphane Graber <stgraber@ubuntu.com>
lxc · Jul 18, 2014 · d21bbd9 · d21bbd9
1 parent 1e5be81
commit d21bbd9
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 71 deletions.
diff --git a/hooks/Makefile.am b/hooks/Makefile.am
@@ -2,7 +2,6 @@ hooksdir=@LXCHOOKDIR@
 
 hooks_SCRIPTS = \
 	clonehostname \
-	mountcgroups \
 	mountecryptfsroot \
 	ubuntu-cloud-prep \
 	squid-deb-proxy-client

diff --git a/hooks/mountcgroups b/hooks/mountcgroups
diff --git a/templates/lxc-cirros.in b/templates/lxc-cirros.in
@@ -121,7 +121,7 @@ lxc.cap.drop = sys_module mac_admin mac_override sys_time
 #lxc.aa_profile = unconfined
 # To support container nesting on an Ubuntu host, uncomment next two lines:
 #lxc.aa_profile = lxc-container-default-with-nesting
-#lxc.hook.mount = /usr/share/lxc/hooks/mountcgroups
+#lxc.mount.auto = cgroup
 
 lxc.cgroup.devices.deny = a
 # Allow any mknod (but not using the node)