summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitrios Apostolou <jimis@qt.io>2020-04-17 16:05:23 +0200
committerDimitrios Apostolou <jimis@qt.io>2020-04-20 07:56:53 +0000
commit500713f3899ca519d5af67322c846c7d599c890c (patch)
tree87b2e2b06094ff8f4121bccee0ede95e5d2c7a90
parenta4e4b04af4bd2a0077c9d9f970cb38f790e2de2b (diff)
Fix error starting danted during boot
Change-Id: Ic014f9b674624efc8d0070c9cf4db9e07a768d2e Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
-rwxr-xr-xpuppet/modules/network_test_server/files/init/danted10
1 files changed, 9 insertions, 1 deletions
diff --git a/puppet/modules/network_test_server/files/init/danted b/puppet/modules/network_test_server/files/init/danted
index 9d021ff..d9cac06 100755
--- a/puppet/modules/network_test_server/files/init/danted
+++ b/puppet/modules/network_test_server/files/init/danted
@@ -3,9 +3,17 @@
# dante SOCKS server init.d file. Based on /etc/init.d/skeleton:
# Version: @(#)skeleton 1.8 03-Mar-1998 miquels@cistron.nl
+
+# NAME of this script may be `danted' or `danted-authenticating'
+NAME=$(basename $0)
+# If basename is like "S20danted", then strip the first 3 characters
+if echo $NAME | grep -q '^[SK][0-9][0-9]'
+then
+ NAME=`echo $NAME | cut -c 4-`
+fi
+
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/sbin/danted
-NAME=$(basename $0) # may be `danted', `danted-authenticating', etc.
DESC="Dante SOCKS daemon"
CONFFILE=/etc/$NAME.conf