From 873d48ce9334326b490a6ffdb1ae9e7b71869042 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Thu, 29 Sep 2016 10:44:09 +0200 Subject: [PATCH] tools: lxc-checkconfig conditionalize devpts check Only check for DEVPTS_MULTIPLE_INSTANCES on kernels < 4.7. Signed-off-by: Christian Brauner --- src/lxc/tools/lxc-checkconfig.in | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/lxc/tools/lxc-checkconfig.in b/src/lxc/tools/lxc-checkconfig.in index 29586f869..61627e0f8 100644 --- a/src/lxc/tools/lxc-checkconfig.in +++ b/src/lxc/tools/lxc-checkconfig.in @@ -72,6 +72,16 @@ if gunzip -tq < $CONFIG 2>/dev/null; then CAT="zcat" fi +KVER_MAJOR=$($CAT $CONFIG | grep '^# Linux.*Kernel Configuration' | \ + sed -r 's/.* ([0-9])\.[0-9]{1,2}\.[0-9]{1,3}.*/\1/') +if [ "$KVER_MAJOR" = "2" ]; then +KVER_MINOR=$($CAT $CONFIG | grep '^# Linux.*Kernel Configuration' | \ + sed -r 's/.* 2.6.([0-9]{2}).*/\1/') +else +KVER_MINOR=$($CAT $CONFIG | grep '^# Linux.*Kernel Configuration' | \ + sed -r 's/.* [0-9]\.([0-9]{1,3})\.[0-9]{1,3}.*/\1/') +fi + echo "--- Namespaces ---" echo -n "Namespaces: " && is_enabled CONFIG_NAMESPACES yes echo -n "Utsname namespace: " && is_enabled CONFIG_UTS_NS @@ -79,7 +89,9 @@ echo -n "Ipc namespace: " && is_enabled CONFIG_IPC_NS yes echo -n "Pid namespace: " && is_enabled CONFIG_PID_NS yes echo -n "User namespace: " && is_enabled CONFIG_USER_NS echo -n "Network namespace: " && is_enabled CONFIG_NET_NS -echo -n "Multiple /dev/pts instances: " && is_enabled DEVPTS_MULTIPLE_INSTANCES +if ([ $KVER_MAJOR -lt 4 ]) || ([ $KVER_MAJOR -eq 4 ] && [ $KVER_MINOR -lt 7 ]); then + echo -n "Multiple /dev/pts instances: " && is_enabled DEVPTS_MULTIPLE_INSTANCES +fi echo echo "--- Control groups ---" @@ -89,15 +101,6 @@ print_cgroups() { } CGROUP_MNT_PATH=`print_cgroups cgroup /proc/self/mounts | head -n 1` -KVER_MAJOR=$($CAT $CONFIG | grep '^# Linux.*Kernel Configuration' | \ - sed -r 's/.* ([0-9])\.[0-9]{1,2}\.[0-9]{1,3}.*/\1/') -if [ "$KVER_MAJOR" = "2" ]; then -KVER_MINOR=$($CAT $CONFIG | grep '^# Linux.*Kernel Configuration' | \ - sed -r 's/.* 2.6.([0-9]{2}).*/\1/') -else -KVER_MINOR=$($CAT $CONFIG | grep '^# Linux.*Kernel Configuration' | \ - sed -r 's/.* [0-9]\.([0-9]{1,3})\.[0-9]{1,3}.*/\1/') -fi echo -n "Cgroup: " && is_enabled CONFIG_CGROUPS yes -- 2.47.2