tazpanel rev 592
Hide procps's "ps" warning (on boot log and more) like: "Unknown HZ value! (70) Assume 100."
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Mon May 23 16:31:22 2016 +0300 (2016-05-23) |
parents | c8226a527542 |
children | 60f0e46985a5 |
files | boot.cgi index.cgi settings.cgi tazpanel |
line diff
1.1 --- a/boot.cgi Thu Apr 28 23:18:44 2016 +0200 1.2 +++ b/boot.cgi Mon May 23 16:31:22 2016 +0300 1.3 @@ -126,9 +126,9 @@ 1.4 /etc/init.d/${daemon#stop=} stop | log ;; 1.5 pid=*) 1.6 echo "<pre>" 1.7 - ps ww | sed 1q 1.8 + ps ww 2>/dev/null | sed 1q 1.9 for i in $(echo ${daemon#pid=} | sed 's/%20/ /g'); do 1.10 - ps ww | sed "/^ $i /!d" 1.11 + ps ww 2>/dev/null | sed "/^ $i /!d" 1.12 done 1.13 echo "</pre>" ;; 1.14 esac
2.1 --- a/index.cgi Thu Apr 28 23:18:44 2016 +0200 2.2 +++ b/index.cgi Mon May 23 16:31:22 2016 +0300 2.3 @@ -543,7 +543,7 @@ 2.4 cat <<EOT 2.5 <section> 2.6 <header> 2.7 - $(ps auxww | sed "/^ *$curpid /!d") 2.8 + $(ps auxww 2>/dev/null | sed "/^ *$curpid /!d") 2.9 <form> 2.10 <input type="hidden" name="top"/> 2.11 <button type="submit" data-icon="@remove@" name="kill" value="$curpid">$(_ 'Kill')</button>
3.1 --- a/settings.cgi Thu Apr 28 23:18:44 2016 +0200 3.2 +++ b/settings.cgi Mon May 23 16:31:22 2016 +0300 3.3 @@ -37,7 +37,7 @@ 3.4 [ -z "$DISPLAY" ] && export DISPLAY=':0.0' 3.5 3.6 # find LXPanel ProcessID, filter out zombie '[lxpanel]' (if any) 3.7 - lxpanel_pid="$(ps -o comm,pid,args | grep lxpanel | grep -v -E 'grep|sh|\[' | awk '{print $2}')" 3.8 + lxpanel_pid="$(ps -o comm,pid,args 2>/dev/null | grep lxpanel | grep -v -E 'grep|sh|\[' | awk '{print $2}')" 3.9 3.10 # if LXPanel not running, just run it with default option 3.11 if [ -z "$lxpanel_pid" ]; then 3.12 @@ -45,12 +45,12 @@ 3.13 sh -l -c "lxpanel -p slitaz" & 3.14 else 3.15 # who started LXPanel?.. 3.16 - lxpanel_user="$(ps -o pid,user | fgrep "$lxpanel_pid " | awk '{print $2}')" 3.17 + lxpanel_user="$(ps -o pid,user 2>/dev/null | fgrep "$lxpanel_pid " | awk '{print $2}')" 3.18 3.19 # ... current user? 3.20 if [ "$USER" == "$lxpanel_user" ]; then 3.21 # custom command? 3.22 - lxpanel_comm="$(ps -o pid,args | grep -e "^\ *$lxpanel_pid " | awk '{$1="";print}')" 3.23 + lxpanel_comm="$(ps -o pid,args 2>/dev/null | grep -e "^\ *$lxpanel_pid " | awk '{$1="";print}')" 3.24 [ -z "$lxpanel_comm" ] && lxpanel_comm='lxpanel -p slitaz' 3.25 3.26 # stop LXPanel and start it again with the same command
4.1 --- a/tazpanel Thu Apr 28 23:18:44 2016 +0200 4.2 +++ b/tazpanel Mon May 23 16:31:22 2016 +0300 4.3 @@ -58,7 +58,7 @@ 4.4 _n 'Starting TazPanel web server on port %d...' $HTTPD_PORT 4.5 $DAEMON -p $HTTPD_PORT -u root -c $HTTPD_CONF \ 4.6 -r "$(_ 'TazPanel Authentication - Default: root:root')" & 4.7 - ps | grep "$DAEMON -p $HTTPD_PORT " | grep -v grep | \ 4.8 + ps 2>/dev/null | grep "$DAEMON -p $HTTPD_PORT " | grep -v grep | \ 4.9 awk '{ print $1 }' > $PIDFILE 4.10 [ ! -f /var/lib/tazpkg/installed.info ] && tazpkg -l>/dev/null& 4.11 status ;;