From 3e865223c2324bceab8e4730e477038cfb732550 Mon Sep 17 00:00:00 2001 From: Marc SCHAEFER Date: Sat, 10 Aug 2019 11:43:35 +0200 Subject: [PATCH] lxc < 3 support --- plugins/lxc/lxc-lib | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/lxc/lxc-lib b/plugins/lxc/lxc-lib index 90f90e6b..577cc70d 100644 --- a/plugins/lxc/lxc-lib +++ b/plugins/lxc/lxc-lib @@ -44,7 +44,7 @@ function lxc_cgroup { lxc-cgroup -o /dev/stdout -l INFO $* | sed 's/^.*lxc_cgroup.c:main:[0-9][0-9]* - //' # lxc < 3 - #lxc-cgroup $* +# lxc-cgroup $* } function lxc_clean_fieldname { @@ -56,7 +56,11 @@ function lxc_netdev { local g=$1 dev if [ -f $lxcpath/$g/config ]; then - grep lxc.net.0.veth.pair $lxcpath/$g/config | awk '{print $NF;}' + # lxc3 + egrep '^lxc.net.0.veth.pair' $lxcpath/$g/config | awk '{print $NF;}' + + # lxc < 3 +# egrep '^lxc.network.veth.pair' $lxcpath/$g/config | awk '{print $NF;}' else echo unknown fi