From 69371a45a10b87a1d100a74238634388862c8acf Mon Sep 17 00:00:00 2001 From: Ivan Ilves Date: Mon, 24 Apr 2017 14:31:16 +0200 Subject: [PATCH] Solve (?) CentOS6 environment / PATH issue --- scripts/server-execute.sh | 4 ++++ scripts/server-setup.sh | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/scripts/server-execute.sh b/scripts/server-execute.sh index 9bb0084..31d6bf5 100755 --- a/scripts/server-execute.sh +++ b/scripts/server-execute.sh @@ -15,6 +15,10 @@ declare -r NETWORK_DEVICE=tun${TUNNEL_ID} let CLIENT_LAST_IP_ADDR_OCTET="4*(${TUNNEL_ID}-1)+1" declare -r CLIENT_IP_ADDR=${IP_BASE}.${CLIENT_LAST_IP_ADDR_OCTET} +if [[ ! $(echo "${PATH}" | egrep "(^|:)/sbin($|:)") ]]; then + export PATH="/sbin:${PATH}" +fi + trap teardown EXIT function teardown() { diff --git a/scripts/server-setup.sh b/scripts/server-setup.sh index 6d215d7..3e1a690 100755 --- a/scripts/server-setup.sh +++ b/scripts/server-setup.sh @@ -20,6 +20,10 @@ declare -r SERVER_IP_ADDR=${IP_BASE}.${SERVER_LAST_IP_ADDR_OCTET} declare -r SSHD_CONFIG_FILE=/etc/ssh/sshd_config +if [[ ! $(echo "${PATH}" | egrep "(^|:)/sbin($|:)") ]]; then + export PATH="/sbin:${PATH}" +fi + if [[ -x /bin/systemctl && -f /lib/systemd/system/ssh.service ]]; then declare -r SSHD_RESTART_CMD="systemctl reload ssh" elif [[ -f /etc/init/ssh.conf ]]; then