Merge branch 'adamierymenko-dev' of ssh://earth.zerotier.net:55522/git/ZeroTierOne into adamierymenko-dev

This commit is contained in:
Adam Ierymenko 2014-12-19 15:24:23 -08:00
commit ebb63cce70

View File

@ -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