Browse Source

Remove &s from restarts in installer -- probably part of the restart problem.

Adam Ierymenko 10 years ago
parent
commit
d10abab786
1 changed files with 3 additions and 5 deletions
  1. 3 5
      ext/installfiles/linux/install.tmpl.sh

+ 3 - 5
ext/installfiles/linux/install.tmpl.sh

@@ -116,7 +116,7 @@ if [ -n "$SYSTEMDUNITDIR" -a -d "$SYSTEMDUNITDIR" ]; then
 	systemctl enable zerotier-one.service
 	systemctl enable zerotier-one.service
 	if [ "$origVersion" != "$newVersion" ]; then
 	if [ "$origVersion" != "$newVersion" ]; then
 		echo 'Version has changed, starting...'
 		echo 'Version has changed, starting...'
-		systemctl restart zerotier-one.service &
+		systemctl restart zerotier-one.service
 	fi
 	fi
 else
 else
 	cp -f /tmp/init.d_zerotier-one /etc/init.d/zerotier-one
 	cp -f /tmp/init.d_zerotier-one /etc/init.d/zerotier-one
@@ -159,15 +159,13 @@ else
 	if [ "$origVersion" != "$newVersion" ]; then
 	if [ "$origVersion" != "$newVersion" ]; then
 		echo 'Version has changed, starting...'
 		echo 'Version has changed, starting...'
 		if [ -f /sbin/service -o -f /usr/sbin/service ]; then
 		if [ -f /sbin/service -o -f /usr/sbin/service ]; then
-			service zerotier-one restart &
+			service zerotier-one restart
 		else
 		else
-			/etc/init.d/zerotier-one restart &
+			/etc/init.d/zerotier-one restart
 		fi
 		fi
 	fi
 	fi
 fi
 fi
 
 
-sleep 1
-
 exit 0
 exit 0
 
 
 # Do not remove the last line or add a carriage return to it! The installer
 # Do not remove the last line or add a carriage return to it! The installer