diff options
author | Lorenz <12514511+RincewindsHat@users.noreply.github.com> | 2022-10-07 11:44:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-07 11:44:47 +0200 |
commit | 1ec6b162cb4e9fb96dcc45319b62fc7e2b3c8726 (patch) | |
tree | ad557fce2f821ec5de384e0cb156a8fbc6c6e1fc | |
parent | b90a5757f77cdc0434fa3f45cf59c63b9e695d90 (diff) | |
download | monitoring-plugins-1ec6b16.tar.gz |
Replace egrep with grep -E (#1791)
Replace egrep with grep -E to avoid the deprecation warnings
-rw-r--r-- | configure.ac | 126 | ||||
-rwxr-xr-x | pkg/solaris/solpkg | 2 | ||||
-rwxr-xr-x | plugins-scripts/check_sensors.sh | 4 |
3 files changed, 66 insertions, 66 deletions
diff --git a/configure.ac b/configure.ac index 8c5ca70a..87a84a0c 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -427,7 +427,7 @@ if test "$ac_cv_header_utmpx_h" = "no" -a "$ac_cv_header_wtsapi32_h" = "no" | |||
427 | then | 427 | then |
428 | AC_PATH_PROG(PATH_TO_WHO,who) | 428 | AC_PATH_PROG(PATH_TO_WHO,who) |
429 | 429 | ||
430 | if [$PATH_TO_WHO -q 2>/dev/null | egrep -i "^# users=[0-9]+$" >/dev/null] | 430 | if [$PATH_TO_WHO -q 2>/dev/null | grep -E -i "^# users=[0-9]+$" >/dev/null] |
431 | then | 431 | then |
432 | ac_cv_path_to_who="$PATH_TO_WHO -q" | 432 | ac_cv_path_to_who="$PATH_TO_WHO -q" |
433 | else | 433 | else |
@@ -776,7 +776,7 @@ dnl Removing this for the moment - Ton | |||
776 | dnl Using /usr/ucb/ps on Solaris systems, to avoid truncation | 776 | dnl Using /usr/ucb/ps on Solaris systems, to avoid truncation |
777 | dnl Limitation that command name is not available | 777 | dnl Limitation that command name is not available |
778 | dnl elif test "$ac_cv_uname_s" = "SunOS" && /usr/ucb/ps -alxwwn 2>/dev/null | \ | 778 | dnl elif test "$ac_cv_uname_s" = "SunOS" && /usr/ucb/ps -alxwwn 2>/dev/null | \ |
779 | dnl egrep -i ["^ *F +UID +PID +PPID +%C +PRI +NI +SZ +RSS +WCHAN +S +TT +TIME +COMMAND"] > /dev/null | 779 | dnl grep -E -i ["^ *F +UID +PID +PPID +%C +PRI +NI +SZ +RSS +WCHAN +S +TT +TIME +COMMAND"] > /dev/null |
780 | dnl then | 780 | dnl then |
781 | dnl ac_cv_ps_varlist="[&procuid,&procpid,&procppid,&procpcpu,&procvsz,&procrss,procstat,&pos]" | 781 | dnl ac_cv_ps_varlist="[&procuid,&procpid,&procppid,&procpcpu,&procvsz,&procrss,procstat,&pos]" |
782 | dnl ac_cv_ps_command="/usr/ucb/ps -alxwwn" | 782 | dnl ac_cv_ps_command="/usr/ucb/ps -alxwwn" |
@@ -786,7 +786,7 @@ dnl AC_MSG_RESULT([$ac_cv_ps_command]) | |||
786 | 786 | ||
787 | dnl This one is the exact same test as the next one but includes etime | 787 | dnl This one is the exact same test as the next one but includes etime |
788 | elif ps axwo 'stat comm vsz rss user uid pid ppid etime args' 2>/dev/null | \ | 788 | elif ps axwo 'stat comm vsz rss user uid pid ppid etime args' 2>/dev/null | \ |
789 | egrep -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +ELAPSED +COMMAND"] > /dev/null | 789 | grep -E -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +ELAPSED +COMMAND"] > /dev/null |
790 | then | 790 | then |
791 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos]" | 791 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos]" |
792 | ac_cv_ps_command="$PATH_TO_PS axwo 'stat uid pid ppid vsz rss pcpu etime comm args'" | 792 | ac_cv_ps_command="$PATH_TO_PS axwo 'stat uid pid ppid vsz rss pcpu etime comm args'" |
@@ -797,7 +797,7 @@ then | |||
797 | dnl Some gnu/linux systems (debian for one) don't like -axwo and need axwo. | 797 | dnl Some gnu/linux systems (debian for one) don't like -axwo and need axwo. |
798 | dnl so test for this first... | 798 | dnl so test for this first... |
799 | elif ps axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \ | 799 | elif ps axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \ |
800 | egrep -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND"] > /dev/null | 800 | grep -E -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND"] > /dev/null |
801 | then | 801 | then |
802 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" | 802 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" |
803 | ac_cv_ps_command="$PATH_TO_PS axwo 'stat uid pid ppid vsz rss pcpu comm args'" | 803 | ac_cv_ps_command="$PATH_TO_PS axwo 'stat uid pid ppid vsz rss pcpu comm args'" |
@@ -809,7 +809,7 @@ dnl For OpenBSD 3.2 & 3.3. Must come before ps -weo | |||
809 | dnl Should also work for FreeBSD 5.2.1 and 5.3 | 809 | dnl Should also work for FreeBSD 5.2.1 and 5.3 |
810 | dnl STAT UCOMM VSZ RSS USER PPID COMMAND | 810 | dnl STAT UCOMM VSZ RSS USER PPID COMMAND |
811 | elif ps -axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \ | 811 | elif ps -axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \ |
812 | egrep -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND"] > /dev/null | 812 | grep -E -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND"] > /dev/null |
813 | then | 813 | then |
814 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" | 814 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" |
815 | ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'" | 815 | ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'" |
@@ -821,7 +821,7 @@ dnl Some *BSDs have different format for ps. This is mainly to catch FreeBSD 4. | |||
821 | dnl Limitation: Only first 16 chars returned for ucomm field | 821 | dnl Limitation: Only first 16 chars returned for ucomm field |
822 | dnl Must come before ps -weo | 822 | dnl Must come before ps -weo |
823 | elif ps -axwo 'stat uid pid ppid vsz rss pcpu ucomm command' 2>/dev/null | \ | 823 | elif ps -axwo 'stat uid pid ppid vsz rss pcpu ucomm command' 2>/dev/null | \ |
824 | egrep -i ["^ *STAT +UID +PID +PPID +VSZ +RSS +%CPU +UCOMM +COMMAND"] > /dev/null | 824 | grep -E -i ["^ *STAT +UID +PID +PPID +VSZ +RSS +%CPU +UCOMM +COMMAND"] > /dev/null |
825 | then | 825 | then |
826 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" | 826 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" |
827 | ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu ucomm command'" | 827 | ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu ucomm command'" |
@@ -831,7 +831,7 @@ then | |||
831 | 831 | ||
832 | dnl STAT UCOMM VSZ RSS USER UID PPID COMMAND | 832 | dnl STAT UCOMM VSZ RSS USER UID PPID COMMAND |
833 | elif ps -weo 'stat comm vsz rss user uid pid ppid etime args' 2>/dev/null | \ | 833 | elif ps -weo 'stat comm vsz rss user uid pid ppid etime args' 2>/dev/null | \ |
834 | egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[ID]+ +P[PID]+ +[ELAPSD]+ +[RGSCOMDNA]+"] >/dev/null | 834 | grep -E -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[ID]+ +P[PID]+ +[ELAPSD]+ +[RGSCOMDNA]+"] >/dev/null |
835 | then | 835 | then |
836 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos]" | 836 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos]" |
837 | ac_cv_ps_command="$PATH_TO_PS -weo 'stat uid pid ppid vsz rss pcpu etime comm args'" | 837 | ac_cv_ps_command="$PATH_TO_PS -weo 'stat uid pid ppid vsz rss pcpu etime comm args'" |
@@ -841,7 +841,7 @@ then | |||
841 | 841 | ||
842 | dnl FreeBSD | 842 | dnl FreeBSD |
843 | elif ps waxco 'state command vsz rss uid user pid ppid' 2>/dev/null | \ | 843 | elif ps waxco 'state command vsz rss uid user pid ppid' 2>/dev/null | \ |
844 | egrep -i ["^STAT +COMMAND +VSZ +RSS +UID +USER +PID +PPID"] >/dev/null | 844 | grep -E -i ["^STAT +COMMAND +VSZ +RSS +UID +USER +PID +PPID"] >/dev/null |
845 | then | 845 | then |
846 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" | 846 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" |
847 | ac_cv_ps_command="$PATH_TO_PS waxco 'state uid pid ppid vsz rss pcpu command command'" | 847 | ac_cv_ps_command="$PATH_TO_PS waxco 'state uid pid ppid vsz rss pcpu command command'" |
@@ -851,7 +851,7 @@ then | |||
851 | 851 | ||
852 | dnl BSD-like mode in RH 6.1 | 852 | dnl BSD-like mode in RH 6.1 |
853 | elif ps waxno 'state comm vsz rss uid user pid ppid args' 2>/dev/null | \ | 853 | elif ps waxno 'state comm vsz rss uid user pid ppid args' 2>/dev/null | \ |
854 | egrep -i ["^S +COMMAND +VSZ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null | 854 | grep -E -i ["^S +COMMAND +VSZ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null |
855 | then | 855 | then |
856 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" | 856 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" |
857 | ac_cv_ps_command="$PATH_TO_PS waxno 'state uid pid ppid vsz rss pcpu comm args'" | 857 | ac_cv_ps_command="$PATH_TO_PS waxno 'state uid pid ppid vsz rss pcpu comm args'" |
@@ -863,7 +863,7 @@ dnl SunOS 4.1.3: | |||
863 | dnl F UID PID PPID CP PRI NI SZ RSS WCHAN STAT TT TIME COMMAND | 863 | dnl F UID PID PPID CP PRI NI SZ RSS WCHAN STAT TT TIME COMMAND |
864 | dnl Need the head -1 otherwise test will work because arguments are found | 864 | dnl Need the head -1 otherwise test will work because arguments are found |
865 | elif ps -laxnwww 2>/dev/null | head -1 | \ | 865 | elif ps -laxnwww 2>/dev/null | head -1 | \ |
866 | egrep -i ["^ *F(LAGS)? +UID +PID +PPID +CP +PRI +NI +(SZ)|(VSZ)|(SIZE) +RSS +WCHAN +STAT? +TTY? +TIME +COMMAND"] >/dev/null | 866 | grep -E -i ["^ *F(LAGS)? +UID +PID +PPID +CP +PRI +NI +(SZ)|(VSZ)|(SIZE) +RSS +WCHAN +STAT? +TTY? +TIME +COMMAND"] >/dev/null |
867 | then | 867 | then |
868 | ac_cv_ps_varlist="[&procuid,&procpid,&procppid,&procvsz,&procrss,procstat,&pos,procprog]" | 868 | ac_cv_ps_varlist="[&procuid,&procpid,&procppid,&procvsz,&procrss,procstat,&pos,procprog]" |
869 | ac_cv_ps_command="$PATH_TO_PS -laxnwww" | 869 | ac_cv_ps_command="$PATH_TO_PS -laxnwww" |
@@ -876,7 +876,7 @@ dnl FLAGS UID PID PPID PRI NI SIZE RSS WCHAN STA TTY TIME COMMA | |||
876 | dnl 100 0 1 0 0 0 776 76 c0131c8c S ffff 0:11 init [2] | 876 | dnl 100 0 1 0 0 0 776 76 c0131c8c S ffff 0:11 init [2] |
877 | dnl | 877 | dnl |
878 | elif ps laxnwww 2>/dev/null | \ | 878 | elif ps laxnwww 2>/dev/null | \ |
879 | egrep -i ["^ *F(LAGS)? +UID +PID +PPID +PRI +NI +(VSZ)|(SIZE) +RSS +WCHAN +STAT? TTY +TIME +COMMAND"] >/dev/null | 879 | grep -E -i ["^ *F(LAGS)? +UID +PID +PPID +PRI +NI +(VSZ)|(SIZE) +RSS +WCHAN +STAT? TTY +TIME +COMMAND"] >/dev/null |
880 | then | 880 | then |
881 | ac_cv_ps_varlist="[&procuid,&procpid,&procppid,procstat,&procvsz,&procrss,&pos,procprog]" | 881 | ac_cv_ps_varlist="[&procuid,&procpid,&procppid,procstat,&procvsz,&procrss,&pos,procprog]" |
882 | ac_cv_ps_command="$PATH_TO_PS laxnwww" | 882 | ac_cv_ps_command="$PATH_TO_PS laxnwww" |
@@ -886,7 +886,7 @@ then | |||
886 | 886 | ||
887 | dnl OpenBSD (needs to come early because -exo appears to work, but does not give all procs) | 887 | dnl OpenBSD (needs to come early because -exo appears to work, but does not give all procs) |
888 | elif ps -axo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \ | 888 | elif ps -axo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \ |
889 | egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null | 889 | grep -E -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null |
890 | then | 890 | then |
891 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" | 891 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" |
892 | ac_cv_ps_command="$PATH_TO_PS -axo 'stat uid pid ppid vsz rss pcpu comm args'" | 892 | ac_cv_ps_command="$PATH_TO_PS -axo 'stat uid pid ppid vsz rss pcpu comm args'" |
@@ -899,7 +899,7 @@ dnl Has /usr/bin/ps and /sbin/ps - force sbin version | |||
899 | dnl Can't use vsize and rssize because comes back with text (eg, 1.5M instead | 899 | dnl Can't use vsize and rssize because comes back with text (eg, 1.5M instead |
900 | dnl of 1500). Will need big changes to check_procs to support | 900 | dnl of 1500). Will need big changes to check_procs to support |
901 | elif /sbin/ps -eo 'stat uid pid ppid pcpu etime comm args' 2>/dev/null | \ | 901 | elif /sbin/ps -eo 'stat uid pid ppid pcpu etime comm args' 2>/dev/null | \ |
902 | egrep -i ["^ *S +[UID]+ +[PID]+ +[PID]+ +[%CPU]+ +[ELAPSD]+ +[COMMAND]+ +[COMMAND]+"] > /dev/null | 902 | grep -E -i ["^ *S +[UID]+ +[PID]+ +[PID]+ +[%CPU]+ +[ELAPSD]+ +[COMMAND]+ +[COMMAND]+"] > /dev/null |
903 | then | 903 | then |
904 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procpcpu,procetime,procprog,&pos]" | 904 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procpcpu,procetime,procprog,&pos]" |
905 | ac_cv_ps_command="/sbin/ps -eo 'stat uid pid ppid pcpu etime comm args'" | 905 | ac_cv_ps_command="/sbin/ps -eo 'stat uid pid ppid pcpu etime comm args'" |
@@ -908,7 +908,7 @@ then | |||
908 | AC_MSG_RESULT([$ac_cv_ps_command]) | 908 | AC_MSG_RESULT([$ac_cv_ps_command]) |
909 | 909 | ||
910 | elif ps -eo 's comm vsz rss user uid pid ppid args' 2>/dev/null | \ | 910 | elif ps -eo 's comm vsz rss user uid pid ppid args' 2>/dev/null | \ |
911 | egrep -i ["^S[TAUES]* +C[OMDNA]+ +[VSIZE]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null | 911 | grep -E -i ["^S[TAUES]* +C[OMDNA]+ +[VSIZE]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null |
912 | then | 912 | then |
913 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" | 913 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" |
914 | ac_cv_ps_command="$PATH_TO_PS -eo 's uid pid ppid vsz rss pcpu comm args'" | 914 | ac_cv_ps_command="$PATH_TO_PS -eo 's uid pid ppid vsz rss pcpu comm args'" |
@@ -918,7 +918,7 @@ then | |||
918 | 918 | ||
919 | dnl AIX 4.3.3 and 5.1 do not have an rss field | 919 | dnl AIX 4.3.3 and 5.1 do not have an rss field |
920 | elif ps -eo 'stat uid pid ppid vsz pcpu comm args' 2>/dev/null | \ | 920 | elif ps -eo 'stat uid pid ppid vsz pcpu comm args' 2>/dev/null | \ |
921 | egrep -i ["^ *S[TAUES]* +UID +PID +PPID +VSZ +%CPU +COMMAND +COMMAND"] >/dev/null | 921 | grep -E -i ["^ *S[TAUES]* +UID +PID +PPID +VSZ +%CPU +COMMAND +COMMAND"] >/dev/null |
922 | then | 922 | then |
923 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procpcpu,procprog,&pos]" | 923 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procpcpu,procprog,&pos]" |
924 | ac_cv_ps_command="$PATH_TO_PS -eo 'stat uid pid ppid vsz pcpu comm args'" | 924 | ac_cv_ps_command="$PATH_TO_PS -eo 'stat uid pid ppid vsz pcpu comm args'" |
@@ -928,7 +928,7 @@ then | |||
928 | 928 | ||
929 | dnl Solaris 2.6 | 929 | dnl Solaris 2.6 |
930 | elif ps -Ao 's comm vsz rss uid user pid ppid args' 2>/dev/null | \ | 930 | elif ps -Ao 's comm vsz rss uid user pid ppid args' 2>/dev/null | \ |
931 | egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null | 931 | grep -E -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null |
932 | then | 932 | then |
933 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" | 933 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" |
934 | ac_cv_ps_command="$PATH_TO_PS -Ao 's uid pid ppid vsz rss pcpu comm args'" | 934 | ac_cv_ps_command="$PATH_TO_PS -Ao 's uid pid ppid vsz rss pcpu comm args'" |
@@ -939,7 +939,7 @@ then | |||
939 | AC_MSG_RESULT([$ac_cv_ps_command]) | 939 | AC_MSG_RESULT([$ac_cv_ps_command]) |
940 | 940 | ||
941 | elif ps -Ao 'status comm vsz rss uid user pid ppid args' 2>/dev/null | \ | 941 | elif ps -Ao 'status comm vsz rss uid user pid ppid args' 2>/dev/null | \ |
942 | egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null | 942 | grep -E -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null |
943 | then | 943 | then |
944 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" | 944 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" |
945 | ac_cv_ps_command="$PATH_TO_PS -Ao 'status uid pid ppid vsz rss pcpu comm args'" | 945 | ac_cv_ps_command="$PATH_TO_PS -Ao 'status uid pid ppid vsz rss pcpu comm args'" |
@@ -948,7 +948,7 @@ then | |||
948 | AC_MSG_RESULT([$ac_cv_ps_command]) | 948 | AC_MSG_RESULT([$ac_cv_ps_command]) |
949 | 949 | ||
950 | elif ps -Ao 'state comm vsz rss uid user pid ppid args' 2>/dev/null | \ | 950 | elif ps -Ao 'state comm vsz rss uid user pid ppid args' 2>/dev/null | \ |
951 | egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null | 951 | grep -E -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null |
952 | then | 952 | then |
953 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" | 953 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" |
954 | ac_cv_ps_command="$PATH_TO_PS -Ao 'state uid pid ppid vsz rss pcpu comm args'" | 954 | ac_cv_ps_command="$PATH_TO_PS -Ao 'state uid pid ppid vsz rss pcpu comm args'" |
@@ -958,7 +958,7 @@ then | |||
958 | 958 | ||
959 | dnl wonder who takes state instead of stat | 959 | dnl wonder who takes state instead of stat |
960 | elif ps -ao 'state command vsz rss user pid ppid args' 2>/dev/null | \ | 960 | elif ps -ao 'state command vsz rss user pid ppid args' 2>/dev/null | \ |
961 | egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null | 961 | grep -E -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null |
962 | then | 962 | then |
963 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" | 963 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" |
964 | ac_cv_ps_command="$PATH_TO_PS -ao 'state uid pid ppid vsz rss pcpu command args'" | 964 | ac_cv_ps_command="$PATH_TO_PS -ao 'state uid pid ppid vsz rss pcpu command args'" |
@@ -968,7 +968,7 @@ then | |||
968 | 968 | ||
969 | dnl IRIX 53 | 969 | dnl IRIX 53 |
970 | elif ps -el 2>/dev/null | \ | 970 | elif ps -el 2>/dev/null | \ |
971 | egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null | 971 | grep -E -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null |
972 | then | 972 | then |
973 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&pos,procprog]" | 973 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&pos,procprog]" |
974 | ac_cv_ps_command="$PATH_TO_PS -el (IRIX 53)" | 974 | ac_cv_ps_command="$PATH_TO_PS -el (IRIX 53)" |
@@ -978,7 +978,7 @@ then | |||
978 | 978 | ||
979 | dnl IRIX 63 | 979 | dnl IRIX 63 |
980 | elif ps -el 2>/dev/null | \ | 980 | elif ps -el 2>/dev/null | \ |
981 | egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +ADDR +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null | 981 | grep -E -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +ADDR +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null |
982 | then | 982 | then |
983 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]" | 983 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]" |
984 | ac_cv_ps_command="$PATH_TO_PS -el (IRIX 63)" | 984 | ac_cv_ps_command="$PATH_TO_PS -el (IRIX 63)" |
@@ -991,7 +991,7 @@ dnl S UID RUID USER RUSER PID PPID VSZ %CPU COMMAND | |||
991 | dnl S 0 400 root oracle 2805 1 12904 0.00 ora_dism_SEA1X ora_dism_SEA1X | 991 | dnl S 0 400 root oracle 2805 1 12904 0.00 ora_dism_SEA1X ora_dism_SEA1X |
992 | dnl S 400 400 oracle oracle 19261 1 126488 0.00 tnslsnr /u01/app/oracle/product/db/11.2.0.3/bin/tnslsnr LISTENER -inherit | 992 | dnl S 400 400 oracle oracle 19261 1 126488 0.00 tnslsnr /u01/app/oracle/product/db/11.2.0.3/bin/tnslsnr LISTENER -inherit |
993 | elif env UNIX95=1 ps -eo 'state uid ruid user ruser pid ppid vsz pcpu comm args' 2>/dev/null | head -n 1 | \ | 993 | elif env UNIX95=1 ps -eo 'state uid ruid user ruser pid ppid vsz pcpu comm args' 2>/dev/null | head -n 1 | \ |
994 | egrep -i ["^ *S +UID +RUID +USER +RUSER +PID +PPID +VSZ +%CPU +COMMAND +COMMAND"] >/dev/null | 994 | grep -E -i ["^ *S +UID +RUID +USER +RUSER +PID +PPID +VSZ +%CPU +COMMAND +COMMAND"] >/dev/null |
995 | then | 995 | then |
996 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procpcpu,procprog,&pos]" | 996 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procpcpu,procprog,&pos]" |
997 | ac_cv_ps_command="$PATH_TO_ENV UNIX95=1 $PATH_TO_PS -eo 'state uid pid ppid vsz pcpu comm args'" | 997 | ac_cv_ps_command="$PATH_TO_ENV UNIX95=1 $PATH_TO_PS -eo 'state uid pid ppid vsz pcpu comm args'" |
@@ -1003,7 +1003,7 @@ dnl AIX 4.1: | |||
1003 | dnl F S UID PID PPID C PRI NI ADDR SZ RSS WCHAN TTY TIME CMD | 1003 | dnl F S UID PID PPID C PRI NI ADDR SZ RSS WCHAN TTY TIME CMD |
1004 | dnl 303 A 0 0 0 120 16 -- 1c07 20 24 - 0:45 swapper | 1004 | dnl 303 A 0 0 0 120 16 -- 1c07 20 24 - 0:45 swapper |
1005 | elif ps -el 2>/dev/null | \ | 1005 | elif ps -el 2>/dev/null | \ |
1006 | egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +ADDR +SZ +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null | 1006 | grep -E -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +ADDR +SZ +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null |
1007 | then | 1007 | then |
1008 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]" | 1008 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]" |
1009 | ac_cv_ps_command="$PATH_TO_PS -el (AIX 4.1 and HP-UX)" | 1009 | ac_cv_ps_command="$PATH_TO_PS -el (AIX 4.1 and HP-UX)" |
@@ -1013,7 +1013,7 @@ then | |||
1013 | 1013 | ||
1014 | dnl AIX? | 1014 | dnl AIX? |
1015 | elif ps glaxen 2>/dev/null | \ | 1015 | elif ps glaxen 2>/dev/null | \ |
1016 | egrep -i ["^ *F +UID +PID +PPID +PRI +NI +VSZ +RSS +WCHAN +STAT +TTY +TIME +COMMAND"] >/dev/null | 1016 | grep -E -i ["^ *F +UID +PID +PPID +PRI +NI +VSZ +RSS +WCHAN +STAT +TTY +TIME +COMMAND"] >/dev/null |
1017 | then | 1017 | then |
1018 | ac_cv_ps_varlist="[&procuid,&procpid,&procppid,&procvsz,&procrss,procstat,&pos,procprog]" | 1018 | ac_cv_ps_varlist="[&procuid,&procpid,&procppid,&procvsz,&procrss,procstat,&pos,procprog]" |
1019 | ac_cv_ps_command="$PATH_TO_PS glaxen" | 1019 | ac_cv_ps_command="$PATH_TO_PS glaxen" |
@@ -1027,7 +1027,7 @@ dnl Some truncation will happen in UCOMM column | |||
1027 | dnl STAT VSZ RSS UID PPID %CPU UCOMM COMMAND | 1027 | dnl STAT VSZ RSS UID PPID %CPU UCOMM COMMAND |
1028 | dnl Ss 52756 22496 501 1 6.9 Window Manager /System/Library/CoreServices/WindowServer -daemon | 1028 | dnl Ss 52756 22496 501 1 6.9 Window Manager /System/Library/CoreServices/WindowServer -daemon |
1029 | elif ps wwaxo 'state vsz rss uid pid ppid pcpu ucomm command' 2>/dev/null | \ | 1029 | elif ps wwaxo 'state vsz rss uid pid ppid pcpu ucomm command' 2>/dev/null | \ |
1030 | egrep -i ["^STAT +VSZ +RSS +UID +PPID +%CPU +UCOMM +COMMAND"] >/dev/null | 1030 | grep -E -i ["^STAT +VSZ +RSS +UID +PPID +%CPU +UCOMM +COMMAND"] >/dev/null |
1031 | then | 1031 | then |
1032 | ac_cv_ps_command="$PATH_TO_PS wwaxo 'state vsz rss uid pid ppid pcpu ucomm command'" | 1032 | ac_cv_ps_command="$PATH_TO_PS wwaxo 'state vsz rss uid pid ppid pcpu ucomm command'" |
1033 | ac_cv_ps_varlist="[procstat,&procvsz,&procrss,&procuid,&procpid,&procppid,&procpcpu,procprog,&pos]" | 1033 | ac_cv_ps_varlist="[procstat,&procvsz,&procrss,&procuid,&procpid,&procppid,&procpcpu,procprog,&pos]" |
@@ -1037,7 +1037,7 @@ then | |||
1037 | 1037 | ||
1038 | dnl UnixWare | 1038 | dnl UnixWare |
1039 | elif ps -Al 2>/dev/null | \ | 1039 | elif ps -Al 2>/dev/null | \ |
1040 | egrep -i ["^ *F +S +UID +PID +PPID +CLS +PRI +NI +C +ADDR +SZ +WCHAN +TTY +TIME +COMD"] >/dev/null | 1040 | grep -E -i ["^ *F +S +UID +PID +PPID +CLS +PRI +NI +C +ADDR +SZ +WCHAN +TTY +TIME +COMD"] >/dev/null |
1041 | then | 1041 | then |
1042 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]" | 1042 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]" |
1043 | ac_cv_ps_command="$PATH_TO_PS -Al" | 1043 | ac_cv_ps_command="$PATH_TO_PS -Al" |
@@ -1105,14 +1105,14 @@ then | |||
1105 | 1105 | ||
1106 | elif [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \ | 1106 | elif [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \ |
1107 | $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \ | 1107 | $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \ |
1108 | egrep -i "^round-trip|^rtt" >/dev/null | 1108 | grep -E -i "^round-trip|^rtt" >/dev/null |
1109 | then | 1109 | then |
1110 | with_ping_command="$PATH_TO_PING -n -U -c %d %s" | 1110 | with_ping_command="$PATH_TO_PING -n -U -c %d %s" |
1111 | ac_cv_ping_packets_first=yes | 1111 | ac_cv_ping_packets_first=yes |
1112 | AC_MSG_RESULT([$with_ping_command]) | 1112 | AC_MSG_RESULT([$with_ping_command]) |
1113 | 1113 | ||
1114 | elif $PATH_TO_PING -4 -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \ | 1114 | elif $PATH_TO_PING -4 -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \ |
1115 | egrep -i "^round-trip|^rtt" >/dev/null | 1115 | grep -E -i "^round-trip|^rtt" >/dev/null |
1116 | then | 1116 | then |
1117 | # check if -4 is supported - issue #1550 | 1117 | # check if -4 is supported - issue #1550 |
1118 | with_ping_command="$PATH_TO_PING -4 -n -U -w %d -c %d %s" | 1118 | with_ping_command="$PATH_TO_PING -4 -n -U -w %d -c %d %s" |
@@ -1120,7 +1120,7 @@ then | |||
1120 | ac_cv_ping_has_timeout=yes | 1120 | ac_cv_ping_has_timeout=yes |
1121 | AC_MSG_RESULT([$with_ping_command]) | 1121 | AC_MSG_RESULT([$with_ping_command]) |
1122 | elif $PATH_TO_PING -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \ | 1122 | elif $PATH_TO_PING -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \ |
1123 | egrep -i "^round-trip|^rtt" >/dev/null | 1123 | grep -E -i "^round-trip|^rtt" >/dev/null |
1124 | then | 1124 | then |
1125 | with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s" | 1125 | with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s" |
1126 | ac_cv_ping_packets_first=yes | 1126 | ac_cv_ping_packets_first=yes |
@@ -1128,52 +1128,52 @@ then | |||
1128 | AC_MSG_RESULT([$with_ping_command]) | 1128 | AC_MSG_RESULT([$with_ping_command]) |
1129 | 1129 | ||
1130 | elif $PATH_TO_PING -n -U -c 1 127.0.0.1 2>/dev/null | \ | 1130 | elif $PATH_TO_PING -n -U -c 1 127.0.0.1 2>/dev/null | \ |
1131 | egrep -i "^round-trip|^rtt" >/dev/null | 1131 | grep -E -i "^round-trip|^rtt" >/dev/null |
1132 | then | 1132 | then |
1133 | with_ping_command="$PATH_TO_PING -n -U -c %d %s" | 1133 | with_ping_command="$PATH_TO_PING -n -U -c %d %s" |
1134 | ac_cv_ping_packets_first=yes | 1134 | ac_cv_ping_packets_first=yes |
1135 | AC_MSG_RESULT([$with_ping_command]) | 1135 | AC_MSG_RESULT([$with_ping_command]) |
1136 | 1136 | ||
1137 | elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \ | 1137 | elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \ |
1138 | egrep -i "^round-trip|^rtt" >/dev/null | 1138 | grep -E -i "^round-trip|^rtt" >/dev/null |
1139 | then | 1139 | then |
1140 | with_ping_command="$PATH_TO_PING -n -c %d %s" | 1140 | with_ping_command="$PATH_TO_PING -n -c %d %s" |
1141 | ac_cv_ping_packets_first=yes | 1141 | ac_cv_ping_packets_first=yes |
1142 | AC_MSG_RESULT([$with_ping_command]) | 1142 | AC_MSG_RESULT([$with_ping_command]) |
1143 | 1143 | ||
1144 | elif $PATH_TO_PING -n 127.0.0.1 -c 1 2>/dev/null | \ | 1144 | elif $PATH_TO_PING -n 127.0.0.1 -c 1 2>/dev/null | \ |
1145 | egrep -i "^round-trip|^rtt" >/dev/null | 1145 | grep -E -i "^round-trip|^rtt" >/dev/null |
1146 | then | 1146 | then |
1147 | with_ping_command="$PATH_TO_PING -n %s -c %d" | 1147 | with_ping_command="$PATH_TO_PING -n %s -c %d" |
1148 | AC_MSG_RESULT([$with_ping_command]) | 1148 | AC_MSG_RESULT([$with_ping_command]) |
1149 | 1149 | ||
1150 | elif $PATH_TO_PING 127.0.0.1 -n 1 2>/dev/null | \ | 1150 | elif $PATH_TO_PING 127.0.0.1 -n 1 2>/dev/null | \ |
1151 | egrep -i "^round-trip|^rtt" >/dev/null | 1151 | grep -E -i "^round-trip|^rtt" >/dev/null |
1152 | then | 1152 | then |
1153 | with_ping_command="$PATH_TO_PING %s -n %d" | 1153 | with_ping_command="$PATH_TO_PING %s -n %d" |
1154 | AC_MSG_RESULT([$with_ping_command]) | 1154 | AC_MSG_RESULT([$with_ping_command]) |
1155 | 1155 | ||
1156 | elif $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \ | 1156 | elif $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \ |
1157 | egrep -i "^round-trip|^rtt" >/dev/null | 1157 | grep -E -i "^round-trip|^rtt" >/dev/null |
1158 | then | 1158 | then |
1159 | with_ping_command="$PATH_TO_PING -n -s %s 56 %d" | 1159 | with_ping_command="$PATH_TO_PING -n -s %s 56 %d" |
1160 | AC_MSG_RESULT([$with_ping_command]) | 1160 | AC_MSG_RESULT([$with_ping_command]) |
1161 | 1161 | ||
1162 | elif $PATH_TO_PING -n -h 127.0.0.1 -s 56 -c 1 2>/dev/null | \ | 1162 | elif $PATH_TO_PING -n -h 127.0.0.1 -s 56 -c 1 2>/dev/null | \ |
1163 | egrep -i "^round-trip|^rtt" >/dev/null | 1163 | grep -E -i "^round-trip|^rtt" >/dev/null |
1164 | then | 1164 | then |
1165 | with_ping_command="$PATH_TO_PING -n -h %s -s 56 -c %d" | 1165 | with_ping_command="$PATH_TO_PING -n -h %s -s 56 -c %d" |
1166 | AC_MSG_RESULT([$with_ping_command]) | 1166 | AC_MSG_RESULT([$with_ping_command]) |
1167 | 1167 | ||
1168 | elif $PATH_TO_PING -n -s 56 -c 1 127.0.0.1 2>/dev/null | \ | 1168 | elif $PATH_TO_PING -n -s 56 -c 1 127.0.0.1 2>/dev/null | \ |
1169 | egrep -i "^round-trip|^rtt" >/dev/null | 1169 | grep -E -i "^round-trip|^rtt" >/dev/null |
1170 | then | 1170 | then |
1171 | with_ping_command="$PATH_TO_PING -n -s 56 -c %d %s" | 1171 | with_ping_command="$PATH_TO_PING -n -s 56 -c %d %s" |
1172 | ac_cv_ping_packets_first=yes | 1172 | ac_cv_ping_packets_first=yes |
1173 | AC_MSG_RESULT([$with_ping_command]) | 1173 | AC_MSG_RESULT([$with_ping_command]) |
1174 | 1174 | ||
1175 | elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \ | 1175 | elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \ |
1176 | egrep -i "^round-trip|^rtt" >/dev/null | 1176 | grep -E -i "^round-trip|^rtt" >/dev/null |
1177 | then | 1177 | then |
1178 | with_ping_command="$PATH_TO_PING -n -c %d %s" | 1178 | with_ping_command="$PATH_TO_PING -n -c %d %s" |
1179 | ac_cv_ping_packets_first=yes | 1179 | ac_cv_ping_packets_first=yes |
@@ -1229,14 +1229,14 @@ elif [[ "z$ac_cv_uname_o" = "zCygwin" -a "x$PATH_TO_PING" != "x" ]]; then | |||
1229 | elif test "x$PATH_TO_PING6" != "x"; then | 1229 | elif test "x$PATH_TO_PING6" != "x"; then |
1230 | if [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \ | 1230 | if [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \ |
1231 | $PATH_TO_PING6 -n -s ::1 56 1 2>/dev/null | \ | 1231 | $PATH_TO_PING6 -n -s ::1 56 1 2>/dev/null | \ |
1232 | egrep -i "^round-trip|^rtt" >/dev/null | 1232 | grep -E -i "^round-trip|^rtt" >/dev/null |
1233 | then | 1233 | then |
1234 | with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s" | 1234 | with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s" |
1235 | ac_cv_ping6_packets_first=yes | 1235 | ac_cv_ping6_packets_first=yes |
1236 | AC_MSG_RESULT([$with_ping6_command]) | 1236 | AC_MSG_RESULT([$with_ping6_command]) |
1237 | 1237 | ||
1238 | elif $PATH_TO_PING6 -n -U -w 10 -c 1 ::1 2>/dev/null | \ | 1238 | elif $PATH_TO_PING6 -n -U -w 10 -c 1 ::1 2>/dev/null | \ |
1239 | egrep -i "^round-trip|^rtt" >/dev/null | 1239 | grep -E -i "^round-trip|^rtt" >/dev/null |
1240 | then | 1240 | then |
1241 | with_ping6_command="$PATH_TO_PING6 -n -U -w %d -c %d %s" | 1241 | with_ping6_command="$PATH_TO_PING6 -n -U -w %d -c %d %s" |
1242 | ac_cv_ping6_packets_first=yes | 1242 | ac_cv_ping6_packets_first=yes |
@@ -1244,52 +1244,52 @@ elif test "x$PATH_TO_PING6" != "x"; then | |||
1244 | AC_MSG_RESULT([$with_ping6_command]) | 1244 | AC_MSG_RESULT([$with_ping6_command]) |
1245 | 1245 | ||
1246 | elif $PATH_TO_PING6 -n -U -c 1 ::1 2>/dev/null | \ | 1246 | elif $PATH_TO_PING6 -n -U -c 1 ::1 2>/dev/null | \ |
1247 | egrep -i "^round-trip|^rtt" >/dev/null | 1247 | grep -E -i "^round-trip|^rtt" >/dev/null |
1248 | then | 1248 | then |
1249 | with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s" | 1249 | with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s" |
1250 | ac_cv_ping6_packets_first=yes | 1250 | ac_cv_ping6_packets_first=yes |
1251 | AC_MSG_RESULT([$with_ping6_command]) | 1251 | AC_MSG_RESULT([$with_ping6_command]) |
1252 | 1252 | ||
1253 | elif $PATH_TO_PING6 -n -c 1 ::1 2>/dev/null | \ | 1253 | elif $PATH_TO_PING6 -n -c 1 ::1 2>/dev/null | \ |
1254 | egrep -i "^round-trip|^rtt" >/dev/null | 1254 | grep -E -i "^round-trip|^rtt" >/dev/null |
1255 | then | 1255 | then |
1256 | with_ping6_command="$PATH_TO_PING6 -n -c %d %s" | 1256 | with_ping6_command="$PATH_TO_PING6 -n -c %d %s" |
1257 | ac_cv_ping6_packets_first=yes | 1257 | ac_cv_ping6_packets_first=yes |
1258 | AC_MSG_RESULT([$with_ping6_command]) | 1258 | AC_MSG_RESULT([$with_ping6_command]) |
1259 | 1259 | ||
1260 | elif $PATH_TO_PING6 -n ::1 -c 1 2>/dev/null | \ | 1260 | elif $PATH_TO_PING6 -n ::1 -c 1 2>/dev/null | \ |
1261 | egrep -i "^round-trip|^rtt" >/dev/null | 1261 | grep -E -i "^round-trip|^rtt" >/dev/null |
1262 | then | 1262 | then |
1263 | with_ping6_command="$PATH_TO_PING6 -n %s -c %d" | 1263 | with_ping6_command="$PATH_TO_PING6 -n %s -c %d" |
1264 | AC_MSG_RESULT([$with_ping6_command]) | 1264 | AC_MSG_RESULT([$with_ping6_command]) |
1265 | 1265 | ||
1266 | elif $PATH_TO_PING6 ::1 -n 1 2>/dev/null | \ | 1266 | elif $PATH_TO_PING6 ::1 -n 1 2>/dev/null | \ |
1267 | egrep -i "^round-trip|^rtt" >/dev/null | 1267 | grep -E -i "^round-trip|^rtt" >/dev/null |
1268 | then | 1268 | then |
1269 | with_ping6_command="$PATH_TO_PING6 %s -n %d" | 1269 | with_ping6_command="$PATH_TO_PING6 %s -n %d" |
1270 | AC_MSG_RESULT([$with_ping6_command]) | 1270 | AC_MSG_RESULT([$with_ping6_command]) |
1271 | 1271 | ||
1272 | elif $PATH_TO_PING6 -n -s ::1 56 1 2>/dev/null | \ | 1272 | elif $PATH_TO_PING6 -n -s ::1 56 1 2>/dev/null | \ |
1273 | egrep -i "^round-trip|^rtt" >/dev/null | 1273 | grep -E -i "^round-trip|^rtt" >/dev/null |
1274 | then | 1274 | then |
1275 | with_ping6_command="$PATH_TO_PING6 -n -s %s 56 %d" | 1275 | with_ping6_command="$PATH_TO_PING6 -n -s %s 56 %d" |
1276 | AC_MSG_RESULT([$with_ping6_command]) | 1276 | AC_MSG_RESULT([$with_ping6_command]) |
1277 | 1277 | ||
1278 | elif $PATH_TO_PING6 -n -h ::1 -s 56 -c 1 2>/dev/null | \ | 1278 | elif $PATH_TO_PING6 -n -h ::1 -s 56 -c 1 2>/dev/null | \ |
1279 | egrep -i "^round-trip|^rtt" >/dev/null | 1279 | grep -E -i "^round-trip|^rtt" >/dev/null |
1280 | then | 1280 | then |
1281 | with_ping6_command="$PATH_TO_PING6 -n -h %s -s 56 -c %d" | 1281 | with_ping6_command="$PATH_TO_PING6 -n -h %s -s 56 -c %d" |
1282 | AC_MSG_RESULT([$with_ping6_command]) | 1282 | AC_MSG_RESULT([$with_ping6_command]) |
1283 | 1283 | ||
1284 | elif $PATH_TO_PING6 -n -s 56 -c 1 ::1 2>/dev/null | \ | 1284 | elif $PATH_TO_PING6 -n -s 56 -c 1 ::1 2>/dev/null | \ |
1285 | egrep -i "^round-trip|^rtt" >/dev/null | 1285 | grep -E -i "^round-trip|^rtt" >/dev/null |
1286 | then | 1286 | then |
1287 | with_ping6_command="$PATH_TO_PING6 -n -s 56 -c %d %s" | 1287 | with_ping6_command="$PATH_TO_PING6 -n -s 56 -c %d %s" |
1288 | ac_cv_ping6_packets_first=yes | 1288 | ac_cv_ping6_packets_first=yes |
1289 | AC_MSG_RESULT([$with_ping_command]) | 1289 | AC_MSG_RESULT([$with_ping_command]) |
1290 | 1290 | ||
1291 | elif $PATH_TO_PING6 -n -c 1 ::1 2>/dev/null | \ | 1291 | elif $PATH_TO_PING6 -n -c 1 ::1 2>/dev/null | \ |
1292 | egrep -i "^round-trip|^rtt" >/dev/null | 1292 | grep -E -i "^round-trip|^rtt" >/dev/null |
1293 | then | 1293 | then |
1294 | with_ping6_command="$PATH_TO_PING6 -n -c %d %s" | 1294 | with_ping6_command="$PATH_TO_PING6 -n -c %d %s" |
1295 | ac_cv_ping6_packets_first=yes | 1295 | ac_cv_ping6_packets_first=yes |
@@ -1300,59 +1300,59 @@ elif test "x$PATH_TO_PING6" != "x"; then | |||
1300 | elif test "x$PATH_TO_PING" != "x"; then | 1300 | elif test "x$PATH_TO_PING" != "x"; then |
1301 | if [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \ | 1301 | if [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \ |
1302 | $PATH_TO_PING -A inet6 -n -s ::1 56 1 2>/dev/null | \ | 1302 | $PATH_TO_PING -A inet6 -n -s ::1 56 1 2>/dev/null | \ |
1303 | egrep -i "^round-trip|^rtt" >/dev/null | 1303 | grep -E -i "^round-trip|^rtt" >/dev/null |
1304 | then | 1304 | then |
1305 | with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s" | 1305 | with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s" |
1306 | ac_cv_ping6_packets_first=yes | 1306 | ac_cv_ping6_packets_first=yes |
1307 | AC_MSG_RESULT([$with_ping6_command]) | 1307 | AC_MSG_RESULT([$with_ping6_command]) |
1308 | 1308 | ||
1309 | elif $PATH_TO_PING -A inet6 -n -U -c 1 ::1 2>/dev/null | \ | 1309 | elif $PATH_TO_PING -A inet6 -n -U -c 1 ::1 2>/dev/null | \ |
1310 | egrep -i "^round-trip|^rtt" >/dev/null | 1310 | grep -E -i "^round-trip|^rtt" >/dev/null |
1311 | then | 1311 | then |
1312 | with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s" | 1312 | with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s" |
1313 | ac_cv_ping6_packets_first=yes | 1313 | ac_cv_ping6_packets_first=yes |
1314 | AC_MSG_RESULT([$with_ping6_command]) | 1314 | AC_MSG_RESULT([$with_ping6_command]) |
1315 | 1315 | ||
1316 | elif $PATH_TO_PING -A inet6 -n -c 1 ::1 2>/dev/null | \ | 1316 | elif $PATH_TO_PING -A inet6 -n -c 1 ::1 2>/dev/null | \ |
1317 | egrep -i "^round-trip|^rtt" >/dev/null | 1317 | grep -E -i "^round-trip|^rtt" >/dev/null |
1318 | then | 1318 | then |
1319 | with_ping6_command="$PATH_TO_PING -A inet6 -n -c %d %s" | 1319 | with_ping6_command="$PATH_TO_PING -A inet6 -n -c %d %s" |
1320 | ac_cv_ping6_packets_first=yes | 1320 | ac_cv_ping6_packets_first=yes |
1321 | AC_MSG_RESULT([$with_ping6_command]) | 1321 | AC_MSG_RESULT([$with_ping6_command]) |
1322 | 1322 | ||
1323 | elif $PATH_TO_PING -A inet6 -n ::1 -c 1 2>/dev/null | \ | 1323 | elif $PATH_TO_PING -A inet6 -n ::1 -c 1 2>/dev/null | \ |
1324 | egrep -i "^round-trip|^rtt" >/dev/null | 1324 | grep -E -i "^round-trip|^rtt" >/dev/null |
1325 | then | 1325 | then |
1326 | with_ping6_command="$PATH_TO_PING -A inet6 -n %s -c %d" | 1326 | with_ping6_command="$PATH_TO_PING -A inet6 -n %s -c %d" |
1327 | AC_MSG_RESULT([$with_ping6_command]) | 1327 | AC_MSG_RESULT([$with_ping6_command]) |
1328 | 1328 | ||
1329 | elif $PATH_TO_PING -A inet6 ::1 -n 1 2>/dev/null | \ | 1329 | elif $PATH_TO_PING -A inet6 ::1 -n 1 2>/dev/null | \ |
1330 | egrep -i "^round-trip|^rtt" >/dev/null | 1330 | grep -E -i "^round-trip|^rtt" >/dev/null |
1331 | then | 1331 | then |
1332 | with_ping6_command="$PATH_TO_PING -A inet6 %s -n %d" | 1332 | with_ping6_command="$PATH_TO_PING -A inet6 %s -n %d" |
1333 | AC_MSG_RESULT([$with_ping6_command]) | 1333 | AC_MSG_RESULT([$with_ping6_command]) |
1334 | 1334 | ||
1335 | elif $PATH_TO_PING -A inet6 -n -s ::1 56 1 2>/dev/null | \ | 1335 | elif $PATH_TO_PING -A inet6 -n -s ::1 56 1 2>/dev/null | \ |
1336 | egrep -i "^round-trip|^rtt" >/dev/null | 1336 | grep -E -i "^round-trip|^rtt" >/dev/null |
1337 | then | 1337 | then |
1338 | with_ping6_command="$PATH_TO_PING -A inet6 -n -s %s 56 %d" | 1338 | with_ping6_command="$PATH_TO_PING -A inet6 -n -s %s 56 %d" |
1339 | AC_MSG_RESULT([$with_ping6_command]) | 1339 | AC_MSG_RESULT([$with_ping6_command]) |
1340 | 1340 | ||
1341 | elif $PATH_TO_PING -A inet6 -n -h ::1 -s 56 -c 1 2>/dev/null | \ | 1341 | elif $PATH_TO_PING -A inet6 -n -h ::1 -s 56 -c 1 2>/dev/null | \ |
1342 | egrep -i "^round-trip|^rtt" >/dev/null | 1342 | grep -E -i "^round-trip|^rtt" >/dev/null |
1343 | then | 1343 | then |
1344 | with_ping6_command="$PATH_TO_PING -A inet6 -n -h %s -s 56 -c %d" | 1344 | with_ping6_command="$PATH_TO_PING -A inet6 -n -h %s -s 56 -c %d" |
1345 | AC_MSG_RESULT([$with_ping6_command]) | 1345 | AC_MSG_RESULT([$with_ping6_command]) |
1346 | 1346 | ||
1347 | elif $PATH_TO_PING -A inet6 -n -s 56 -c 1 ::1 2>/dev/null | \ | 1347 | elif $PATH_TO_PING -A inet6 -n -s 56 -c 1 ::1 2>/dev/null | \ |
1348 | egrep -i "^round-trip|^rtt" >/dev/null | 1348 | grep -E -i "^round-trip|^rtt" >/dev/null |
1349 | then | 1349 | then |
1350 | with_ping6_command="$PATH_TO_PING -A inet6 -n -s 56 -c %d %s" | 1350 | with_ping6_command="$PATH_TO_PING -A inet6 -n -s 56 -c %d %s" |
1351 | ac_cv_ping6_packets_first=yes | 1351 | ac_cv_ping6_packets_first=yes |
1352 | AC_MSG_RESULT([$with_ping_command]) | 1352 | AC_MSG_RESULT([$with_ping_command]) |
1353 | 1353 | ||
1354 | elif $PATH_TO_PING -A inet6 -n -c 1 ::1 2>/dev/null | \ | 1354 | elif $PATH_TO_PING -A inet6 -n -c 1 ::1 2>/dev/null | \ |
1355 | egrep -i "^round-trip|^rtt" >/dev/null | 1355 | grep -E -i "^round-trip|^rtt" >/dev/null |
1356 | then | 1356 | then |
1357 | with_ping6_command="$PATH_TO_PING -A inet6 -n -c %d %s" | 1357 | with_ping6_command="$PATH_TO_PING -A inet6 -n -c %d %s" |
1358 | ac_cv_ping6_packets_first=yes | 1358 | ac_cv_ping6_packets_first=yes |
@@ -1589,14 +1589,14 @@ then | |||
1589 | ac_cv_have_swap=yes | 1589 | ac_cv_have_swap=yes |
1590 | ac_cv_swap_command="$PATH_TO_SWAP -l" | 1590 | ac_cv_swap_command="$PATH_TO_SWAP -l" |
1591 | if [$PATH_TO_SWAP -l 2>/dev/null | \ | 1591 | if [$PATH_TO_SWAP -l 2>/dev/null | \ |
1592 | egrep -i "^lswap +path +pri +swaplo +blocks +free +maxswap" \ | 1592 | grep -E -i "^lswap +path +pri +swaplo +blocks +free +maxswap" \ |
1593 | >/dev/null] | 1593 | >/dev/null] |
1594 | then | 1594 | then |
1595 | ac_cv_swap_format=[" %*d %*s %*d,%*d %*d %*d %f %f"] | 1595 | ac_cv_swap_format=[" %*d %*s %*d,%*d %*d %*d %f %f"] |
1596 | ac_cv_swap_conv=2048 | 1596 | ac_cv_swap_conv=2048 |
1597 | AC_MSG_RESULT([using IRIX format swap]) | 1597 | AC_MSG_RESULT([using IRIX format swap]) |
1598 | 1598 | ||
1599 | elif [$PATH_TO_SWAP -l 2>/dev/null | egrep -i "^path +dev +swaplo +blocks +free" >/dev/null] | 1599 | elif [$PATH_TO_SWAP -l 2>/dev/null | grep -E -i "^path +dev +swaplo +blocks +free" >/dev/null] |
1600 | then | 1600 | then |
1601 | ac_cv_swap_format=["%*s %*[0-9,-] %*d %f %f"] | 1601 | ac_cv_swap_format=["%*s %*[0-9,-] %*d %f %f"] |
1602 | ac_cv_swap_conv=2048 | 1602 | ac_cv_swap_conv=2048 |
@@ -1615,19 +1615,19 @@ AC_PATH_PROG(PATH_TO_SWAPINFO,swapinfo) | |||
1615 | if (test -n "$PATH_TO_SWAPINFO") | 1615 | if (test -n "$PATH_TO_SWAPINFO") |
1616 | then | 1616 | then |
1617 | AC_MSG_CHECKING([for $PATH_TO_SWAPINFO format]) | 1617 | AC_MSG_CHECKING([for $PATH_TO_SWAPINFO format]) |
1618 | if [$PATH_TO_SWAPINFO -k 2>&1 | egrep -i "^Device" >/dev/null] | 1618 | if [$PATH_TO_SWAPINFO -k 2>&1 | grep -E -i "^Device" >/dev/null] |
1619 | then | 1619 | then |
1620 | ac_cv_have_swap=yes | 1620 | ac_cv_have_swap=yes |
1621 | ac_cv_swap_command="$PATH_TO_SWAPINFO -k" | 1621 | ac_cv_swap_command="$PATH_TO_SWAPINFO -k" |
1622 | 1622 | ||
1623 | if [$PATH_TO_SWAPINFO -k 2>/dev/null | egrep -i "^Device +1K-blocks +Used +Avail" >/dev/null] | 1623 | if [$PATH_TO_SWAPINFO -k 2>/dev/null | grep -E -i "^Device +1K-blocks +Used +Avail" >/dev/null] |
1624 | then | 1624 | then |
1625 | ac_cv_swap_format=["%*s %f %*d %f"] | 1625 | ac_cv_swap_format=["%*s %f %*d %f"] |
1626 | ac_cv_swap_conv=1024 | 1626 | ac_cv_swap_conv=1024 |
1627 | AC_MSG_RESULT([using FreeBSD format swapinfo]) | 1627 | AC_MSG_RESULT([using FreeBSD format swapinfo]) |
1628 | fi | 1628 | fi |
1629 | 1629 | ||
1630 | elif [$PATH_TO_SWAPINFO -dfM 2>/dev/null | egrep -i "^TYPE +AVAIL +USED +FREE" >/dev/null] | 1630 | elif [$PATH_TO_SWAPINFO -dfM 2>/dev/null | grep -E -i "^TYPE +AVAIL +USED +FREE" >/dev/null] |
1631 | then | 1631 | then |
1632 | ac_cv_have_swap=yes | 1632 | ac_cv_have_swap=yes |
1633 | ac_cv_swap_command="$PATH_TO_SWAPINFO -dfM" | 1633 | ac_cv_swap_command="$PATH_TO_SWAPINFO -dfM" |
@@ -1642,7 +1642,7 @@ AC_PATH_PROG(PATH_TO_LSPS,lsps) | |||
1642 | if (test -n "$PATH_TO_LSPS") | 1642 | if (test -n "$PATH_TO_LSPS") |
1643 | then | 1643 | then |
1644 | AC_MSG_CHECKING([for $PATH_TO_LSPS format]) | 1644 | AC_MSG_CHECKING([for $PATH_TO_LSPS format]) |
1645 | if [$PATH_TO_LSPS -a 2>/dev/null | egrep -i "^Page Space" > /dev/null] | 1645 | if [$PATH_TO_LSPS -a 2>/dev/null | grep -E -i "^Page Space" > /dev/null] |
1646 | then | 1646 | then |
1647 | ac_cv_have_swap=yes | 1647 | ac_cv_have_swap=yes |
1648 | ac_cv_swap_command="$PATH_TO_LSPS -a" | 1648 | ac_cv_swap_command="$PATH_TO_LSPS -a" |
@@ -1844,7 +1844,7 @@ AC_ARG_ENABLE(redhat-pthread-workaround, | |||
1844 | [ac_cv_enable_redhat_pthread_workaround=$enableval], | 1844 | [ac_cv_enable_redhat_pthread_workaround=$enableval], |
1845 | [ac_cv_enable_redhat_pthread_workaround=test]) | 1845 | [ac_cv_enable_redhat_pthread_workaround=test]) |
1846 | if test "$ac_cv_enable_redhat_pthread_workaround" = "test" ; then | 1846 | if test "$ac_cv_enable_redhat_pthread_workaround" = "test" ; then |
1847 | if echo $ac_cv_uname_r | egrep "\.EL(smp)?$" >/dev/null 2>&1 ; then | 1847 | if echo $ac_cv_uname_r | grep -E "\.EL(smp)?$" >/dev/null 2>&1 ; then |
1848 | AC_MSG_NOTICE([See https://www.monitoring-plugins.org/doc/faq/configure-hangs.html if this next part takes a long time]) | 1848 | AC_MSG_NOTICE([See https://www.monitoring-plugins.org/doc/faq/configure-hangs.html if this next part takes a long time]) |
1849 | AC_MSG_CHECKING(for redhat spopen problem) | 1849 | AC_MSG_CHECKING(for redhat spopen problem) |
1850 | ( cd config_test && make && make test ) > /dev/null 2>&1 | 1850 | ( cd config_test && make && make test ) > /dev/null 2>&1 |
diff --git a/pkg/solaris/solpkg b/pkg/solaris/solpkg index a21176e4..73b3c647 100755 --- a/pkg/solaris/solpkg +++ b/pkg/solaris/solpkg | |||
@@ -9,7 +9,7 @@ $pkgtrans = "/usr/bin/pkgtrans"; | |||
9 | $prototype = "prototype"; | 9 | $prototype = "prototype"; |
10 | $pkginfo = "pkginfo"; | 10 | $pkginfo = "pkginfo"; |
11 | $preinstall = "preinstall"; | 11 | $preinstall = "preinstall"; |
12 | $egrep = "/usr/bin/egrep"; | 12 | $egrep = "/usr/bin/grep -E"; |
13 | 13 | ||
14 | # Sanity check | 14 | # Sanity check |
15 | 15 | ||
diff --git a/plugins-scripts/check_sensors.sh b/plugins-scripts/check_sensors.sh index ab4e726e..921e7b36 100755 --- a/plugins-scripts/check_sensors.sh +++ b/plugins-scripts/check_sensors.sh | |||
@@ -49,10 +49,10 @@ case "$1" in | |||
49 | elif test "${status}" -ne 0; then | 49 | elif test "${status}" -ne 0; then |
50 | text="WARNING - sensors returned state $status" | 50 | text="WARNING - sensors returned state $status" |
51 | exit=$STATE_WARNING | 51 | exit=$STATE_WARNING |
52 | elif echo "${sensordata}" | egrep ALARM > /dev/null; then | 52 | elif echo "${sensordata}" | grep -E ALARM > /dev/null; then |
53 | text="SENSOR CRITICAL - Sensor alarm detected!" | 53 | text="SENSOR CRITICAL - Sensor alarm detected!" |
54 | exit=$STATE_CRITICAL | 54 | exit=$STATE_CRITICAL |
55 | elif echo "${sensordata}" | egrep FAULT > /dev/null \ | 55 | elif echo "${sensordata}" | grep -E FAULT > /dev/null \ |
56 | && test "$1" != "-i" -a "$1" != "--ignore-fault"; then | 56 | && test "$1" != "-i" -a "$1" != "--ignore-fault"; then |
57 | text="SENSOR UNKNOWN - Sensor reported fault" | 57 | text="SENSOR UNKNOWN - Sensor reported fault" |
58 | exit=$STATE_UNKNOWN | 58 | exit=$STATE_UNKNOWN |