From 3931ae8ee039266e43f79520bd731dbbce76e046 Mon Sep 17 00:00:00 2001
From: William Murphy <warrendiogenese@gmail.com>
Date: Fri, 8 Aug 2014 05:45:12 -0700
Subject: [PATCH] linux nohup fix

---
 client/xymonclient-aix.sh      | 2 +-
 client/xymonclient-freebsd.sh  | 2 +-
 client/xymonclient-hp-ux.sh    | 2 +-
 client/xymonclient-irix.sh     | 2 +-
 client/xymonclient-linux.sh    | 2 +-
 client/xymonclient-netbsd.sh   | 2 +-
 client/xymonclient-openbsd.sh  | 2 +-
 client/xymonclient-osf1.sh     | 2 +-
 client/xymonclient-sco_sv.sh   | 2 +-
 client/xymonclient-sunos.sh    | 6 +++---
 client/xymonclient-unixware.sh | 2 +-
 xymonnet/protocols.cfg         | 1 +
 xymonnet/xymon-snmpcollect.c   | 2 +-
 13 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/client/xymonclient-aix.sh b/client/xymonclient-aix.sh
index dba070e..9f64341 100755
--- a/client/xymonclient-aix.sh
+++ b/client/xymonclient-aix.sh
@@ -65,7 +65,7 @@ then
 fi
 
 # vmstat
-nohup sh -c "vmstat 300 2 1>$XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ 2>&1; mv $XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ $XYMONTMP/xymon_vmstat.$MACHINEDOTS" </dev/null >/dev/null 2>&1 &
+echo "vmstat 300 2 1>$XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ 2>&1; mv $XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ $XYMONTMP/xymon_vmstat.$MACHINEDOTS 2>&1" | nohup $SHELL >/dev/null &
 sleep 5
 if test -f $XYMONTMP/xymon_vmstat.$MACHINEDOTS; then echo "[vmstat]"; cat $XYMONTMP/xymon_vmstat.$MACHINEDOTS; rm -f $XYMONTMP/xymon_vmstat.$MACHINEDOTS; fi
 
diff --git a/client/xymonclient-freebsd.sh b/client/xymonclient-freebsd.sh
index 5f9926c..d5ae7c2 100755
--- a/client/xymonclient-freebsd.sh
+++ b/client/xymonclient-freebsd.sh
@@ -67,7 +67,7 @@ then
 fi
 
 # vmstat
-nohup sh -c "vmstat 300 2 1>$XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ 2>&1; mv $XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ $XYMONTMP/xymon_vmstat.$MACHINEDOTS" </dev/null >/dev/null 2>&1 &
+echo "vmstat 300 2 1>$XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ 2>&1; mv $XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ $XYMONTMP/xymon_vmstat.$MACHINEDOTS 2>&1" | nohup $SHELL >/dev/null &
 sleep 5
 if test -f $XYMONTMP/xymon_vmstat.$MACHINEDOTS; then echo "[vmstat]"; cat $XYMONTMP/xymon_vmstat.$MACHINEDOTS; rm -f $XYMONTMP/xymon_vmstat.$MACHINEDOTS; fi
 
diff --git a/client/xymonclient-hp-ux.sh b/client/xymonclient-hp-ux.sh
index c3ac685..18c35e2 100755
--- a/client/xymonclient-hp-ux.sh
+++ b/client/xymonclient-hp-ux.sh
@@ -88,7 +88,7 @@ then
 fi
 
 # vmstat
-nohup sh -c "vmstat 300 2 1>$XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ 2>&1; mv $XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ $XYMONTMP/xymon_vmstat.$MACHINEDOTS" </dev/null >/dev/null 2>&1 &
+echo "vmstat 300 2 1>$XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ 2>&1; mv $XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ $XYMONTMP/xymon_vmstat.$MACHINEDOTS 2>&1" | nohup $SHELL >/dev/null &
 sleep 5
 if test -f $XYMONTMP/xymon_vmstat.$MACHINEDOTS; then echo "[vmstat]"; cat $XYMONTMP/xymon_vmstat.$MACHINEDOTS; rm -f $XYMONTMP/xymon_vmstat.$MACHINEDOTS; fi
 
diff --git a/client/xymonclient-irix.sh b/client/xymonclient-irix.sh
index 70d6ae2..400e0d8 100755
--- a/client/xymonclient-irix.sh
+++ b/client/xymonclient-irix.sh
@@ -50,7 +50,7 @@ then
 fi
 
 # vmstat and iostat do not exist on irix. SAR is your only option at this time. 
-nohup sh -c "sar 300 2 1>$XYMONTMP/xymon_sar.$MACHINEDOTS.$$ 2>&1; mv $XYMONTMP/xymon_sar.$MACHINEDOTS.$$ $XYMONTMP/xymon_sar.$MACHINEDOTS" </dev/null >/dev/null 2>&1 &
+nohup $SHELL -c "sar 300 2 1>$XYMONTMP/xymon_sar.$MACHINEDOTS.$$ 2>&1; mv $XYMONTMP/xymon_sar.$MACHINEDOTS.$$ $XYMONTMP/xymon_sar.$MACHINEDOTS" </dev/null >/dev/null 2>&1 &
 sleep 5
 if test -f $XYMONTMP/xymon_sar.$MACHINEDOTS; then echo "[sar]"; cat $XYMONTMP/xymon_sar.$MACHINEDOTS; rm -f $XYMONTMP/xymon_sar.$MACHINEDOTS; fi
 
diff --git a/client/xymonclient-linux.sh b/client/xymonclient-linux.sh
index 3e68fb6..2491e54 100755
--- a/client/xymonclient-linux.sh
+++ b/client/xymonclient-linux.sh
@@ -89,7 +89,7 @@ then
 fi
 
 # vmstat
-nohup sh -c "vmstat 300 2 1>$XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ 2>&1; mv $XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ $XYMONTMP/xymon_vmstat.$MACHINEDOTS" </dev/null >/dev/null 2>&1 &
+echo "vmstat 300 2 1>$XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ 2>&1; mv $XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ $XYMONTMP/xymon_vmstat.$MACHINEDOTS 2>&1" | nohup $SHELL >/dev/null &
 sleep 5
 if test -f $XYMONTMP/xymon_vmstat.$MACHINEDOTS; then echo "[vmstat]"; cat $XYMONTMP/xymon_vmstat.$MACHINEDOTS; rm -f $XYMONTMP/xymon_vmstat.$MACHINEDOTS; fi
 
diff --git a/client/xymonclient-netbsd.sh b/client/xymonclient-netbsd.sh
index 2a440c9..78cdbf5 100755
--- a/client/xymonclient-netbsd.sh
+++ b/client/xymonclient-netbsd.sh
@@ -54,7 +54,7 @@ then
 fi
 
 # vmstat
-nohup sh -c "vmstat 300 2 1>$XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ 2>&1; mv $XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ $XYMONTMP/xymon_vmstat.$MACHINEDOTS" </dev/null >/dev/null 2>&1 &
+echo "vmstat 300 2 1>$XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ 2>&1; mv $XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ $XYMONTMP/xymon_vmstat.$MACHINEDOTS 2>&1" | nohup $SHELL >/dev/null &
 sleep 5
 if test -f $XYMONTMP/xymon_vmstat.$MACHINEDOTS; then echo "[vmstat]"; cat $XYMONTMP/xymon_vmstat.$MACHINEDOTS; rm -f $XYMONTMP/xymon_vmstat.$MACHINEDOTS; fi
 
diff --git a/client/xymonclient-openbsd.sh b/client/xymonclient-openbsd.sh
index 9abc0fd..e65d791 100755
--- a/client/xymonclient-openbsd.sh
+++ b/client/xymonclient-openbsd.sh
@@ -61,7 +61,7 @@ then
 fi
 
 # vmstat
-nohup sh -c "vmstat 300 2 1>$XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ 2>&1; mv $XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ $XYMONTMP/xymon_vmstat.$MACHINEDOTS" </dev/null >/dev/null 2>&1 &
+echo "vmstat 300 2 1>$XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ 2>&1; mv $XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ $XYMONTMP/xymon_vmstat.$MACHINEDOTS 2>&1" | nohup $SHELL >/dev/null &
 sleep 5
 if test -f $XYMONTMP/xymon_vmstat.$MACHINEDOTS; then echo "[vmstat]"; cat $XYMONTMP/xymon_vmstat.$MACHINEDOTS; rm -f $XYMONTMP/xymon_vmstat.$MACHINEDOTS; fi
 
diff --git a/client/xymonclient-osf1.sh b/client/xymonclient-osf1.sh
index 3cedab1..9907808 100755
--- a/client/xymonclient-osf1.sh
+++ b/client/xymonclient-osf1.sh
@@ -52,7 +52,7 @@ then
 fi
 
 # vmstat
-nohup sh -c "vmstat 300 2 1>$XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ 2>&1; mv $XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ $XYMONTMP/xymon_vmstat.$MACHINEDOTS" </dev/null >/dev/null 2>&1 &
+echo "vmstat 300 2 1>$XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ 2>&1; mv $XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ $XYMONTMP/xymon_vmstat.$MACHINEDOTS 2>&1" | nohup $SHELL >/dev/null &
 sleep 5
 if test -f $XYMONTMP/xymon_vmstat.$MACHINEDOTS; then echo "[vmstat]"; cat $XYMONTMP/xymon_vmstat.$MACHINEDOTS; rm -f $XYMONTMP/xymon_vmstat.$MACHINEDOTS; fi
 
diff --git a/client/xymonclient-sco_sv.sh b/client/xymonclient-sco_sv.sh
index dfd5439..eff6b33 100755
--- a/client/xymonclient-sco_sv.sh
+++ b/client/xymonclient-sco_sv.sh
@@ -52,7 +52,7 @@ then
     fi
 fi
 # vmstat
-nohup sh -c "vmstat 300 2 1>$XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ 2>&1; mv $XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ $XYMONTMP/xymon_vmstat.$MACHINEDOTS" </dev/null >/dev/null 2>&1 &
+echo "vmstat 300 2 1>$XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ 2>&1; mv $XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ $XYMONTMP/xymon_vmstat.$MACHINEDOTS 2>&1" | nohup $SHELL >/dev/null &
 sleep 5
 if test -f $XYMONTMP/xymon_vmstat.$MACHINEDOTS; then echo "[vmstat]"; cat $XYMONTMP/xymon_vmstat.$MACHINEDOTS; rm -f $XYMONTMP/xymon_vmstat.$MACHINEDOTS; fi
 
diff --git a/client/xymonclient-sunos.sh b/client/xymonclient-sunos.sh
index 7b401ad..b65ac90 100755
--- a/client/xymonclient-sunos.sh
+++ b/client/xymonclient-sunos.sh
@@ -161,9 +161,9 @@ else
 fi
 
 # vmstat and iostat (iostat -d provides a cpu utilisation with I/O wait number)
-nohup sh -c "vmstat 300 2 1>$XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ 2>&1; mv $XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ $XYMONTMP/xymon_vmstat.$MACHINEDOTS" </dev/null >/dev/null 2>&1 &
-nohup sh -c "iostat -c 300 2 1>$XYMONTMP/xymon_iostatcpu.$MACHINEDOTS.$$ 2>&1; mv $XYMONTMP/xymon_iostatcpu.$MACHINEDOTS.$$ $XYMONTMP/xymon_iostatcpu.$MACHINEDOTS" </dev/null >/dev/null 2>&1 &
-nohup sh -c "iostat -dxsrP 300 2 1>$XYMONTMP/xymon_iostatdisk.$MACHINEDOTS.$$ 2>&1; mv $XYMONTMP/xymon_iostatdisk.$MACHINEDOTS.$$ $XYMONTMP/xymon_iostatdisk.$MACHINEDOTS" </dev/null >/dev/null 2>&1 &
+echo "vmstat 300 2 1>$XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ 2>&1; mv $XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ $XYMONTMP/xymon_vmstat.$MACHINEDOTS 2>&1" | nohup $SHELL >/dev/null &
+echo "iostat -c 300 2 1>$XYMONTMP/xymon_iostatcpu.$MACHINEDOTS.$$ 2>&1; mv $XYMONTMP/xymon_iostatcpu.$MACHINEDOTS.$$ $XYMONTMP/xymon_iostatcpu.$MACHINEDOTS 2>&1" | nohup $SHELL >/dev/null &
+echo "iostat -dxsrP 300 2 1>$XYMONTMP/xymon_iostatdisk.$MACHINEDOTS.$$ 2>&1; mv $XYMONTMP/xymon_iostatdisk.$MACHINEDOTS.$$ $XYMONTMP/xymon_iostatdisk.$MACHINEDOTS 2>&1" | nohup $SHELL >/dev/null &
 sleep 5
 if test -f $XYMONTMP/xymon_vmstat.$MACHINEDOTS; then echo "[vmstat]"; cat $XYMONTMP/xymon_vmstat.$MACHINEDOTS; rm -f $XYMONTMP/xymon_vmstat.$MACHINEDOTS; fi
 if test -f $XYMONTMP/xymon_iostatcpu.$MACHINEDOTS; then echo "[iostatcpu]"; cat $XYMONTMP/xymon_iostatcpu.$MACHINEDOTS; rm -f $XYMONTMP/xymon_iostatcpu.$MACHINEDOTS; fi
diff --git a/client/xymonclient-unixware.sh b/client/xymonclient-unixware.sh
index 4325cdb..7d44c3b 100644
--- a/client/xymonclient-unixware.sh
+++ b/client/xymonclient-unixware.sh
@@ -54,7 +54,7 @@ then
     fi
 fi
 # vmstat
-#nohup sh -c "vmstat 300 2 1>$XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ 2>&1; mv $XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ $XYMONTMP/xymon_vmstat.$MACHINEDOTS" </dev/null >/dev/null 2>&1 &
+#echo "vmstat 300 2 1>$XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ 2>&1; mv $XYMONTMP/xymon_vmstat.$MACHINEDOTS.$$ $XYMONTMP/xymon_vmstat.$MACHINEDOTS 2>&1" | nohup $SHELL >/dev/null &
 #sleep 5
 #if test -f $XYMONTMP/xymon_vmstat.$MACHINEDOTS; then echo "[vmstat]"; cat $XYMONTMP/xymon_vmstat.$MACHINEDOTS; rm -f $XYMONTMP/xymon_vmstat.$MACHINEDOTS; fi
 
diff --git a/xymonnet/protocols.cfg b/xymonnet/protocols.cfg
index 5a47e0e..68ebc92 100644
--- a/xymonnet/protocols.cfg
+++ b/xymonnet/protocols.cfg
@@ -216,3 +216,4 @@
 [lpd]
 	port 515
 
+directory @XYMONHOME@/etc/protocols.d
diff --git a/xymonnet/xymon-snmpcollect.c b/xymonnet/xymon-snmpcollect.c
index d170cb0..cc62a68 100644
--- a/xymonnet/xymon-snmpcollect.c
+++ b/xymonnet/xymon-snmpcollect.c
@@ -12,7 +12,7 @@
 /*                                                                            */
 /*----------------------------------------------------------------------------*/
 
-static char rcsid[] = "$Id: xymon-snmpcollect.c 7204 2013-07-23 12:20:59Z storner $";
+static const char snmpcollect_rcsid[] = "$Id: xymon-snmpcollect.c 7204 2013-07-23 12:20:59Z storner $";
 
 #include <net-snmp/net-snmp-config.h>
 #include <net-snmp/net-snmp-includes.h>
-- 
1.8.4.5