From a9565c42d241ec6ab2bfcaef9fe97aac943a07a0 Mon Sep 17 00:00:00 2001 From: zhangzengfei <zhangzengfei@iotlink.com> Date: 星期五, 08 五月 2020 20:14:26 +0800 Subject: [PATCH] fix netconfig script --- scripts/netconfig | 12 +++++++++--- extend/sys/system.go | 6 +++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/extend/sys/system.go b/extend/sys/system.go index 2433309..3689ea7 100644 --- a/extend/sys/system.go +++ b/extend/sys/system.go @@ -18,12 +18,12 @@ pwd := config.Server.SudoPassword cmdStr := fmt.Sprintf("echo %s | sudo -S %s", pwd, cmd) - return exec.Command("/bin/sh", "-c", cmdStr).Output() + return exec.Command("/bin/bash", "-c", cmdStr).Output() } // 妫�鏌� root鏉冮檺 func CheckRootPermissions() bool { - showRootCMD := exec.Command("/bin/sh", "-c", "ls /root/") + showRootCMD := exec.Command("/bin/bash", "-c", "ls /root/") if _, err := showRootCMD.Output(); err != nil { return false } @@ -83,7 +83,7 @@ // 閰嶇疆鏈嶅姟鍣ㄧ綉缁� func SetNetworkConfig(ipv4, netmask, gateway, dns string) (bool, string) { - networkConfigScript := "/opt/vasystem/bin/netconfig" + networkConfigScript := "/opt/vasystem/script/netconfig" ifname := config.Server.NetworkAdapter localIPv4, localNetMask, _ := GetLocalIP(ifname) localGW, _ := GetDefaultRoute(ifname) diff --git a/scripts/netconfig b/scripts/netconfig index 6b9fae0..72c6e4a 100644 --- a/scripts/netconfig +++ b/scripts/netconfig @@ -2,7 +2,8 @@ # 绯荤粺缃戠粶閰嶇疆鏂囦欢 NETWORK_CONFIG_FILE="/etc/network/interfaces" -LOG_FILE="/opt/vasystem/logs/netconfig.log" +LOG_FILE="/opt/vasystem/script/netconfig.log" +ES_SERVICE_UPDATE="/opt/vasystem/script/updateAllIp.sh" # basic绯荤粺鏈嶅姟鍏抽棴鑴氭湰 SERVICE_STOP_CMD="" @@ -72,10 +73,15 @@ service_restart() { + # 閲嶅惎ES weedfs 鏈嶅姟 + [ -f "$ES_SERVICE_UPDATE" ] && { + su - basic -c "sh ES_SERVICE_UPDATE &" + } + n_log "service restart." >>$LOG_FILE # 閲嶅惎basic鏈嶅姟 - su basic -c "sh /opt/startAllServices.sh &" + su - basic -c "sh /opt/startAllServices.sh &" } # Start Execution @@ -115,7 +121,7 @@ # 閲嶅惎鐩稿叧鏈嶅姟, 涓嶆洿鏀筰p鐨勬儏鍐典笅, 閲嶅惎缃戠粶鍗冲彲 localip=$(/sbin/ifconfig $INTERFACE | grep inet | grep -v inet6 | awk '{printf $2}' | tr -d "addr:") -if [ "$localip" != "$IPADDR" ]; then +if [ "$localip" = "$IPADDR" ]; then service_restart fi -- Gitblit v1.8.0