diff --git a/sysmonitor-1.3.2/script/check_sshd.sh b/sysmonitor-1.3.2/script/check_sshd.sh index 34899a29cd757b1a8315e81edf2032660f207da5..0341593f03c87a0d7287ea8179758a83620d3dae 100755 --- a/sysmonitor-1.3.2/script/check_sshd.sh +++ b/sysmonitor-1.3.2/script/check_sshd.sh @@ -12,8 +12,8 @@ count=$(expr $NUM - 1) function sshd_process_exist() { - status=$(systemctl status sshd -n 0 | grep "Active:" | grep running) - [ -n "${status}" ] && return 0 + systemctl is-active sshd + [ $? -eq 0 ] && return 0 return 1 } @@ -30,7 +30,7 @@ do done if [ $SSHD_STATUS -ne 0 ];then - SSHD_PID=$(ps -ef | grep -w "/usr/sbin/sshd" | grep -v grep | awk '{if ($3==1) print $2}') + SSHD_PID=$(pidof /usr/sbin/sshd) kill -9 $SSHD_PID 2>/dev/null exit 1 fi diff --git a/sysmonitor-1.3.2/script/get_local_disk.sh b/sysmonitor-1.3.2/script/get_local_disk.sh index 063e540cebd4dde36e975894006a4621014afae3..6f5227db19eafc5ce83fa466feec76efeca78a51 100755 --- a/sysmonitor-1.3.2/script/get_local_disk.sh +++ b/sysmonitor-1.3.2/script/get_local_disk.sh @@ -7,13 +7,18 @@ fc_disk_file="" local_disk_file="" -if uname -a | grep -q aarch64; then - fc_local_disk=`ls -l /sys/block/ | grep -E 'pci|HISI0162' 2> /dev/null` -elif uname -a | grep -q riscv64; then - fc_local_disk=`ls -l /sys/block/ | grep -E 'pci|virtio' 2> /dev/null` -else - fc_local_disk=`ls -l /sys/block/ | grep pci 2> /dev/null` -fi +case $(uname -m) in + "aarch64") + fc_local_disk=`ls -l /sys/block/ | grep -E 'pci|HISI0162' 2> /dev/null` + ;; + "riscv64") + fc_local_disk=`ls -l /sys/block/ | grep -E 'pci|virtio' 2> /dev/null` + ;; + *) + fc_local_disk=`ls -l /sys/block/ | grep pci 2> /dev/null` + ;; +esac + disk_list="" # **************************************************************************** #