make mountcgroups hook to lxc.include aware (v2)

[resending the patch from correct branch] commit 09ad6246 introduced lxc.include option to include other config files. This patch uses it in mountcgroups hook otherwise lxc-start fails with following error message for the nested containers; root@oOo:/var/lib/lxc/raring# lxc-start -l debug -o l -n raring -d lxc-start: command get_cgroup failed to receive response Signed-off-by: S.Çağlar Onur <caglar@10ur.org> Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

make mountcgroups hook to lxc.include aware (v2)
fa7fced8 · S.Çağlar Onur · Serge Hallyn · f91d5e4e · fa7fced8
Commit fa7fced8 authored Dec 15, 2013 by S.Çağlar Onur Committed by Serge Hallyn Dec 16, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

mountcgroups hooks/mountcgroups +3 -1

No files found.
--- a/hooks/mountcgroups
+++ b/hooks/mountcgroups
@@ -43,7 +43,9 @@ do_devices_setup() {
    local line
    local w  # which (allow or deny)
    local v  # value
-    egrep "^lxc.cgroup.devices.(allow|deny)[ \t]*=" ${configfile} | while read line; do
+    # lxc.include provides common configuration options
+    local commonconfigfile=$(egrep "^lxc.include[ \t]*=" ${configfile} | awk -F= '{ print $2 }')
+    cat ${configfile} ${commonconfigfile} | egrep "^lxc.cgroup.devices.(allow|deny)[ \t]*=" | while read line; do
        w=`echo $line | awk -F. '{ print $4 }' | awk '{ print $1 }'`
        v=`echo $line | awk -F= '{ print $2 }'`
        echo "$v" >> "$devdir"/devices.$w