aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Niehusmann <jan@gondor.com>2011-02-26 10:18:19 +0100
committerDaniel Lezcano <dlezcano@fr.ibm.com>2011-02-26 10:18:19 +0100
commitbb02d90eeaca4c28b99fee90aab20e0072870f58 (patch)
tree3cfc43a975638e3fab33185c7946b4bd38755f21
parentFixed a small typo in lxc-debian template (diff)
downloadlxc-bb02d90eeaca4c28b99fee90aab20e0072870f58.tar.gz
lxc-bb02d90eeaca4c28b99fee90aab20e0072870f58.tar.bz2
lxc-bb02d90eeaca4c28b99fee90aab20e0072870f58.zip
Update file capa detection for kernels >=2.6.37
The comment containing the version number at the beginning of the kernel config file changed its format with 2.6.37. This trivial patch makes the grep less specific, so it triggers for both formats. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
-rwxr-xr-xsrc/lxc/lxc-checkconfig.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lxc/lxc-checkconfig.in b/src/lxc/lxc-checkconfig.in
index 6ce79f4..ab27b9c 100755
--- a/src/lxc/lxc-checkconfig.in
+++ b/src/lxc/lxc-checkconfig.in
@@ -74,7 +74,7 @@ echo "--- Misc ---"
echo -n "Veth pair device: " && is_enabled CONFIG_VETH
echo -n "Macvlan: " && is_enabled CONFIG_MACVLAN
echo -n "Vlan: " && is_enabled CONFIG_VLAN_8021Q
-KVER_MINOR=$($GREP '^# Linux kernel version:' $CONFIG | \
+KVER_MINOR=$($GREP '^# Linux' $CONFIG | \
sed -r 's/.*2.6.([0-9]{2}).*/\1/')
echo -n "File capabilities: " &&
[[ ${KVER_MINOR} < 33 ]] && is_enabled CONFIG_SECURITY_FILE_CAPABILITIES ||