From 3129b700befce8da1c67975c4bfc81f9066b3629 Mon Sep 17 00:00:00 2001 From: Teddysun Date: Mon, 24 Jul 2017 22:52:03 +0900 Subject: [PATCH] update comments Do not try to start firewalld if it's not running Signed-off-by: Teddysun --- shadowsocks-all.sh | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/shadowsocks-all.sh b/shadowsocks-all.sh index 0583fb3..f44d675 100644 --- a/shadowsocks-all.sh +++ b/shadowsocks-all.sh @@ -353,7 +353,7 @@ config_firewall() { echo -e "${green}Info:${plain} port ${green}${shadowsocksport}${plain} already be enabled." fi else - echo -e "${yellow}Warning:${plain} iptables looks like shutdown or not installed, please enable port ${shadowsocksport} manually if necessary." + echo -e "${yellow}Warning:${plain} iptables looks like not running or not installed, please enable port ${shadowsocksport} manually if necessary." fi elif centosversion 7; then systemctl status firewalld > /dev/null 2>&1 @@ -362,15 +362,7 @@ config_firewall() { firewall-cmd --permanent --zone=public --add-port=${shadowsocksport}/udp firewall-cmd --reload else - echo -e "${yellow}Warning:${plain} firewalld looks like not running, try to start..." - systemctl start firewalld - if [ $? -eq 0 ]; then - firewall-cmd --permanent --zone=public --add-port=${shadowsocksport}/tcp - firewall-cmd --permanent --zone=public --add-port=${shadowsocksport}/udp - firewall-cmd --reload - else - echo -e "${yellow}Warning:${plain} Start firewalld failed, please enable port ${shadowsocksport} manually if necessary." - fi + echo -e "${yellow}Warning:${plain} firewalld looks like not running or not installed, please enable port ${shadowsocksport} manually if necessary." fi fi }