Репозиторий Sisyphus
Последнее обновление: 1 октября 2023 | Пакетов: 18631 | Посещений: 37809144
en ru br
Репозитории ALT
S:4.3.30-alt2
5.1: 4.3.16-alt0.M51.1
www.altlinux.org/Changes

Группа :: Мониторинг
Пакет: xymon

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: xymonclient-linux.sh-various-procps.patch
Скачать


diff -Nur xymon.old/build/bb-commands.sh xymon/build/bb-commands.sh
--- xymon.old/build/bb-commands.sh	2011-03-08 20:20:28.000000000 +0300
+++ xymon/build/bb-commands.sh	2014-02-12 12:31:33.094932231 +0400
@@ -23,7 +23,7 @@
 echo "# Xymon does not use them, but they are provided here so if you use BB extension"
 echo "# scripts, then they will hopefully run without having to do a lot of tweaking."
 echo ""
-for CMD in uptime awk cat cp cut date egrep expr find grep head id ln ls mv rm sed sort tail top touch tr uniq who
+for CMD in uptime awk cat cp cut date egrep expr find grep head id ln ls mv rm sed sort tail top ps touch tr uniq who
 do
 	ENVNAME=`echo $CMD | tr "[a-z]" "[A-Z]"`
 	PGM=`findbin $CMD | head -n 1`
@@ -37,10 +37,9 @@
 
 # DFCMD is an alias for DF
 PGM=`findbin df | head -n 1`
-echo "# DF,DFCMD and PS are for compatibility only, NOT USED by the Xymon client"
+echo "# DF and DFCMD are for compatibility only, NOT USED by the Xymon client"
 echo "DF=\"${PGM} -Pk\""
 echo "DFCMD=\"${PGM} -Pk\""
-echo "PS=\"ps ax\""
 echo ""
 echo "MAXLINE=\"32768\""
 
diff -Nur xymon.old/client/xymonclient-linux.sh xymon/client/xymonclient-linux.sh
--- xymon.old/client/xymonclient-linux.sh	2014-01-24 00:42:41.000000000 +0400
+++ xymon/client/xymonclient-linux.sh	2014-02-12 12:27:41.046924722 +0400
@@ -74,12 +74,13 @@
 # Report mdstat data if it exists
 if test -r /proc/mdstat; then echo "[mdstat]"; cat /proc/mdstat; fi
 echo "[ps]"
-ps -Aww -o pid,ppid,user,start,state,pri,pcpu,time:12,pmem,rsz:10,vsz:10,cmd
+$PS -Aww -o pid,ppid,user,start,state,pri,pcpu,time:12,pmem,rsz:10,vsz:10,cmd
 
 # $TOP must be set, the install utility should do that for us if it exists.
 if test "$TOP" != ""
 then
-    if test -x "$TOP"
+    t_TOP=${TOP%% *}
+    if test -x "$t_TOP"
     then
         echo "[top]"
 	$TOP -b -n 1 
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin