From 748cf3b4ee0dd3c5b02c4450f1b8fd5a06f291db Mon Sep 17 00:00:00 2001
From: Marc SCHAEFER <schaefer@alphanet.ch>
Date: Mon, 19 Aug 2019 15:07:16 +0200
Subject: [PATCH] - grep -EF is invalid - SYSFS: buster has an existing
 /sys/fs/cgroup/systemd/lxc/$guest_name/tasks,          which does not contain
 anything useful, so checking         
 /sys/fs/cgroup/cpuacct/lxc/$guest_name/tasks first. - spurious blank space
 for lxc_net and lxc_ram in here document

---
 plugins/lxc/lxc_guests | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/plugins/lxc/lxc_guests b/plugins/lxc/lxc_guests
index 0b201a3d..97608d4d 100755
--- a/plugins/lxc/lxc_guests
+++ b/plugins/lxc/lxc_guests
@@ -121,8 +121,8 @@ lxc_netdev() {
 
    if [ -f "$lxcpath/$guest_name/config" ]; then
       # lxc 3 vs < 3
-      (grep -EF '^lxc.net.0.veth.pair' "$lxcpath/$guest_name/config" 2>/dev/null \
-         || grep -EF '^lxc.network.veth.pair' "$lxcpath/$guest_name/config"
+      (grep -E '^lxc.net.0.veth.pair' "$lxcpath/$guest_name/config" 2>/dev/null \
+         || grep -E '^lxc.network.veth.pair' "$lxcpath/$guest_name/config"
       ) | awk '{print $NF;}'
    fi
 }
@@ -152,8 +152,8 @@ lxc_count_processes () {
    for SYSFS in \
       "/sys/fs/cgroup/$guest_name/tasks" \
       "/sys/fs/cgroup/lxc/$guest_name/tasks" \
-      "/sys/fs/cgroup/systemd/lxc/$guest_name/tasks" \
       "/sys/fs/cgroup/cpuacct/lxc/$guest_name/tasks" \
+      "/sys/fs/cgroup/systemd/lxc/$guest_name/tasks" \
       "/sys/fs/cgroup/cpuacct/sysdefault/lxc/$guest_name/tasks"
    do
       if [ -e "$SYSFS" ]; then
@@ -372,8 +372,8 @@ do_fetch() {
       fi
 
       cat <<EOF
-   $(clean_fieldname "net_${guest_name}_up").value $value_up
-   $(clean_fieldname "net_${guest_name}_down").value $value_down
+$(clean_fieldname "net_${guest_name}_up").value $value_up
+$(clean_fieldname "net_${guest_name}_down").value $value_down
 EOF
    done
 
@@ -387,10 +387,10 @@ EOF
    for guest_name in $active_guests
    do
       cat <<EOF
-   $(clean_fieldname "mem_usage_${guest_name}").value $(get_lxc_cgroup_info "$guest_name" "memory.usage_in_bytes")
-   $(clean_fieldname "mem_cache_${guest_name}").value $(get_lxc_cgroup_info "$guest_name" "memory.stat" | grep total_cache | awk '{print $2;}')
-   $(clean_fieldname "mem_active_${guest_name}").value $(get_lxc_cgroup_info "$guest_name" "memory.stat" | grep total_active_anon | awk '{print $2;}')
-   $(clean_fieldname "mem_inactive_${guest_name}").value $(get_lxc_cgroup_info "$guest_name" "memory.stat" | grep total_inactive_anon | awk '{print $2;}')
+$(clean_fieldname "mem_usage_${guest_name}").value $(get_lxc_cgroup_info "$guest_name" "memory.usage_in_bytes")
+$(clean_fieldname "mem_cache_${guest_name}").value $(get_lxc_cgroup_info "$guest_name" "memory.stat" | grep total_cache | awk '{print $2;}')
+$(clean_fieldname "mem_active_${guest_name}").value $(get_lxc_cgroup_info "$guest_name" "memory.stat" | grep total_active_anon | awk '{print $2;}')
+$(clean_fieldname "mem_inactive_${guest_name}").value $(get_lxc_cgroup_info "$guest_name" "memory.stat" | grep total_inactive_anon | awk '{print $2;}')
 EOF
    done
 }