summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2014-12-16 12:32:53 -0500
committerAdam Ierymenko <adam.ierymenko@gmail.com>2014-12-16 12:32:53 -0500
commitd10abab786b27b3b32b2f4d0b73fa10c6d0976df (patch)
treee4f5693e9eaf1c0e38c603e3c6071958ecb5225f /ext
parentff539c22f9f90924c7bde05a1c4961534a73595d (diff)
downloadinfinitytier-d10abab786b27b3b32b2f4d0b73fa10c6d0976df.tar.gz
infinitytier-d10abab786b27b3b32b2f4d0b73fa10c6d0976df.zip
Remove &s from restarts in installer -- probably part of the restart problem.
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