Merge remote-tracking branch 'remotes/origin/dev' into issue/3264

This commit is contained in:
m0duspwnens committed 2021-04-21 18:24:07 -04:00
commit 6c8a2e68d9
5 files changed
+51 -27

No files matched your search

+2 -4
View File
@@ -175,10 +175,8 @@ __check_so_status() {
}
__check_salt_master() {
local salt_master_status
salt_master_status=$($sshcmd -i /root/.ssh/so.key soremote@"$MSRV" systemctl is-active --quiet salt-master)
[[ -z $salt_master_status ]] && salt_master_status=1
return $salt_master_status
$sshcmd -i /root/.ssh/so.key soremote@"$MSRV" systemctl is-active --quiet salt-master
return $?
}
check_network_manager_conf() {