From: Jan Niehusmann <jan@gondor.com>
Date: Sat, 26 Feb 2011 09:18:19 +0000 (+0100)
Subject: Update file capa detection for kernels >=2.6.37
X-Git-Tag: lxc-0.7.4~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb02d90eeaca4c28b99fee90aab20e0072870f58;p=thirdparty%2Flxc.git

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>
---

diff --git a/src/lxc/lxc-checkconfig.in b/src/lxc/lxc-checkconfig.in
index 6ce79f420..ab27b9cd1 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 ||