summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@googlemail.com>2013-12-29 13:49:39 +0100
committerlassulus <lassulus@googlemail.com>2013-12-29 13:49:39 +0100
commit7a2b01d9607942d9df076a2e354cefe97d5fc49a (patch)
treec2d31fbe465f8ccbb610639f0e023804a19b7cfd
parente4328ccb256639a66bcedc30c80f89d4f5b342a2 (diff)
retiolum: only 1 restart method required
-rwxr-xr-xretiolum/Makefile2
-rwxr-xr-xretiolum/bin/restart-tincd14
2 files changed, 1 insertions, 15 deletions
diff --git a/retiolum/Makefile b/retiolum/Makefile
index 950099f4..40c5eacc 100755
--- a/retiolum/Makefile
+++ b/retiolum/Makefile
@@ -14,7 +14,7 @@ install: upgrade
upgrade: update
if ! diff -u scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up; then \
sudo cp scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up; \
- sudo bin/restart-tincd || :; \
+ sudo pkill -HUP tincd || :;
fi
update: hosts
diff --git a/retiolum/bin/restart-tincd b/retiolum/bin/restart-tincd
deleted file mode 100755
index 17d939d9..00000000
--- a/retiolum/bin/restart-tincd
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh
-set -xeuf
-
-PATH="$(dirname $(readlink -f "$0"))${PATH+:$PATH}"
-
-if args="`pgrep-retiolum-tincd-args`"; then
- while $args --kill; do
- sleep 1
- done
- $args
-else
- echo "$0: there is no retiolum tincd process to restart" >&2
- exit 23
-fi