summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2014-12-19 15:24:23 -0800
committerAdam Ierymenko <adam.ierymenko@gmail.com>2014-12-19 15:24:23 -0800
commitebb63cce70315469796bb1dafff227a4a795b7b4 (patch)
treeb66e400a716f0a5729db542b2e65f9b09efcd148 /ext
parentf24283a674a30d59ca0228966dc5a75919e5d45c (diff)
parentd10abab786b27b3b32b2f4d0b73fa10c6d0976df (diff)
downloadinfinitytier-ebb63cce70315469796bb1dafff227a4a795b7b4.tar.gz
infinitytier-ebb63cce70315469796bb1dafff227a4a795b7b4.zip
Merge branch 'adamierymenko-dev' of ssh://earth.zerotier.net:55522/git/ZeroTierOne into adamierymenko-dev
Diffstat (limited to 'ext')
-rw-r--r--ext/installfiles/linux/install.tmpl.sh8
1 files changed, 3 insertions, 5 deletions
diff --git a/ext/installfiles/linux/install.tmpl.sh b/ext/installfiles/linux/install.tmpl.sh
index c25f57db..ff747daa 100644
--- a/ext/installfiles/linux/install.tmpl.sh
+++ b/ext/installfiles/linux/install.tmpl.sh
@@ -116,7 +116,7 @@ if [ -n "$SYSTEMDUNITDIR" -a -d "$SYSTEMDUNITDIR" ]; then
systemctl enable zerotier-one.service
if [ "$origVersion" != "$newVersion" ]; then
echo 'Version has changed, starting...'
- systemctl restart zerotier-one.service &
+ systemctl restart zerotier-one.service
fi
else
cp -f /tmp/init.d_zerotier-one /etc/init.d/zerotier-one
@@ -159,15 +159,13 @@ else
if [ "$origVersion" != "$newVersion" ]; then
echo 'Version has changed, starting...'
if [ -f /sbin/service -o -f /usr/sbin/service ]; then
- service zerotier-one restart &
+ service zerotier-one restart
else
- /etc/init.d/zerotier-one restart &
+ /etc/init.d/zerotier-one restart
fi
fi
fi
-sleep 1
-
exit 0
# Do not remove the last line or add a carriage return to it! The installer