From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Tue, 13 Aug 2013 05:05:49 +0000 (-0500)
Subject: mountcgroups: use the right configuration file!
X-Git-Tag: lxc-1.0.0.alpha1~1^2~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bb17b7791777538d8f7cc957939fc871843f218;p=thirdparty%2Flxc.git

mountcgroups: use the right configuration file!

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/hooks/mountcgroups b/hooks/mountcgroups
index c1cdcd446..8ffb370f5 100755
--- a/hooks/mountcgroups
+++ b/hooks/mountcgroups
@@ -26,6 +26,7 @@
 set -e
 
 c=$1
+configfile=$LXC_CONFIG_FILE
 d=/sys/fs/cgroup
 d2=$LXC_ROOTFS_MOUNT/${d}
 # name lxc hook lxcpath
@@ -42,7 +43,7 @@ do_devices_setup() {
     local line
     local w  # which (allow or deny)
     local v  # value
-    egrep "^lxc.cgroup.devices.(allow|deny)[ \t]*=" ${lxcpath}/${c}/config | while read line; do
+    egrep "^lxc.cgroup.devices.(allow|deny)[ \t]*=" ${configfile} | 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