From 009e2c042480bce8bfea3020d3b594d5df6f49a0 Mon Sep 17 00:00:00 2001 From: Gerhard <info@tinned-software.net> Date: Mon, 8 Jun 2015 20:57:54 +0200 Subject: [PATCH] updated initscript; updated script to comply to init return codes --- ssh-tunnel-manager.sh | 8 ++++---- ssh-tunnel-manager.sysv-initscript | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ssh-tunnel-manager.sh b/ssh-tunnel-manager.sh index a6ed253..e9c2c96 100755 --- a/ssh-tunnel-manager.sh +++ b/ssh-tunnel-manager.sh @@ -287,7 +287,7 @@ case $COMMAND in COMMAND_INDEX=$(get_id_from_name "$COMMAND_INDEX_NAME") if [[ "$COMMAND_INDEX" -eq "-1" ]]; then echo "The tunnel with the name '$COMMAND_INDEX_NAME' can not be found." - exit 1 + exit 6 fi IDX_START=$COMMAND_INDEX IDX_END=$((COMMAND_INDEX+1)) @@ -339,7 +339,7 @@ case $COMMAND in COMMAND_INDEX=$(get_id_from_name "$COMMAND_INDEX_NAME") if [[ "$COMMAND_INDEX" -eq "-1" ]]; then echo "The tunnel with the name '$COMMAND_INDEX_NAME' can not be found." - exit 1 + exit 3 fi IDX_START=$COMMAND_INDEX IDX_END=$((COMMAND_INDEX+1)) @@ -361,7 +361,7 @@ case $COMMAND in else echotime "STATUS - Status of Tunnel '${TUNNEL_NAMES[$idx]}' (ID $idx) is ... NOT running" echo "Status of Tunnel '${TUNNEL_NAMES[$idx]}' is ... NOT running" - EXIT_CODE=1 + EXIT_CODE=3 fi done echotime "COMM - Execute STATUS procedure ... Done" @@ -385,7 +385,7 @@ case $COMMAND in COMMAND_INDEX=$(get_id_from_name "$COMMAND_INDEX_NAME") if [[ "$COMMAND_INDEX" -eq "-1" ]]; then echo "The tunnel with the name '$COMMAND_INDEX_NAME' can not be found." - exit 1 + exit 6 fi IDX_START=$COMMAND_INDEX IDX_END=$((COMMAND_INDEX+1)) diff --git a/ssh-tunnel-manager.sysv-initscript b/ssh-tunnel-manager.sysv-initscript index ce6d3f9..4dec55b 100644 --- a/ssh-tunnel-manager.sysv-initscript +++ b/ssh-tunnel-manager.sysv-initscript @@ -38,8 +38,7 @@ stop() { } restart() { - stop - start + $exec restart } rh_status() { -- GitLab