diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-02-14 21:14:34 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-02-14 21:14:34 -0800 |
| commit | e38619dd02673d4e8428442e92fb32cf29d6b8df (patch) | |
| tree | ecd7b63cf4aad403c2bfa5c8e1e196e5c186972d /ext/installfiles | |
| parent | 4ec7cd2760ae8e4b6502aad3400f1c4827a2cfbc (diff) | |
| download | infinitytier-e38619dd02673d4e8428442e92fb32cf29d6b8df.tar.gz infinitytier-e38619dd02673d4e8428442e92fb32cf29d6b8df.zip | |
Small fix to Linux installer.
Diffstat (limited to 'ext/installfiles')
| -rw-r--r-- | ext/installfiles/linux/install.tmpl.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/ext/installfiles/linux/install.tmpl.sh b/ext/installfiles/linux/install.tmpl.sh index cbcddc8e..21ad515d 100644 --- a/ext/installfiles/linux/install.tmpl.sh +++ b/ext/installfiles/linux/install.tmpl.sh @@ -79,6 +79,9 @@ ln -sf /var/lib/zerotier-one/zerotier-one /usr/bin/zerotier-cli echo 'Installing and (re-)starting zerotier-one daemon...' +# Note: ensure that service restarts are the last thing this script actually +# does, since these may kill the script itself. Also note the & to allow +# them to finish independently. if [ -n "$SYSTEMDUNITDIR" -a -d "$SYSTEMDUNITDIR" ]; then # If this was updated or upgraded from an init.d based system, clean up the old # init.d stuff before installing directly via systemd. @@ -90,15 +93,18 @@ if [ -n "$SYSTEMDUNITDIR" -a -d "$SYSTEMDUNITDIR" ]; then fi cp -f /tmp/systemd_zerotier-one.service "$SYSTEMDUNITDIR/zerotier-one.service" + rm -f /tmp/systemd_zerotier-one.service /tmp/init.d_zerotier-one + systemctl enable zerotier-one - systemctl restart zerotier-one + systemctl restart zerotier-one & else cp -f /tmp/init.d_zerotier-one /etc/init.d/zerotier-one chmod 0755 /etc/init.d/zerotier-one + rm -f /tmp/systemd_zerotier-one.service /tmp/init.d_zerotier-one + chkconfig zerotier-one on - service zerotier-one restart + service zerotier-one restart & fi -rm -f /tmp/systemd_zerotier-one.service /tmp/init.d_zerotier-one exit 0 |