summaryrefslogtreecommitdiffstats
path: root/retiolum
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2012-07-05 00:24:12 +0200
committermakefu <github@syntax-fehler.de>2012-07-05 00:24:12 +0200
commit8ef881f4cc499cb79fb427b0ce04c1c82d37125e (patch)
tree6f3b2d2d700ab80389c3c7e49788298affc43fd0 /retiolum
parenta0321c82c7f80d1052108c4a1602b775799e4593 (diff)
//retiolum -v flag not supported by old or retarded systems (openwrt)
Diffstat (limited to 'retiolum')
-rw-r--r--retiolum/Makefile6
-rwxr-xr-xretiolum/bin/update-retiolum-hosts2
2 files changed, 5 insertions, 3 deletions
diff --git a/retiolum/Makefile b/retiolum/Makefile
index 668ee58e..a8ae0973 100644
--- a/retiolum/Makefile
+++ b/retiolum/Makefile
@@ -5,14 +5,13 @@ EXES := update_tinc_hosts fillxx update-retiolum-hosts
all: update links
links:
- for x in $(EXES); do ln -vsnf ../retiolum/bin/$$x ../bin; done
+ for x in $(EXES); do ln -snf ../retiolum/bin/$$x ../bin; done
install: upgrade
../punani/bin/punani install tinc python
scripts/tinc_setup/install.sh
sudo cp scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up
- scripts/autostart/create-startup.sh
upgrade: update
if ! diff -u scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up; then \
@@ -25,5 +24,8 @@ update: hosts
bin/update_tinc_hosts restart
sudo pkill -HUP tincd || :;
+startup:
+ scripts/autostart/create-startup.sh
+
hosts:
bin/update-retiolum-hosts || :;
diff --git a/retiolum/bin/update-retiolum-hosts b/retiolum/bin/update-retiolum-hosts
index 1fecfe15..2a379459 100755
--- a/retiolum/bin/update-retiolum-hosts
+++ b/retiolum/bin/update-retiolum-hosts
@@ -10,7 +10,7 @@ fi
# cd //retiolum
cd $(dirname $(readlink -f $0))/..
-mkdir -v -p /etc/tinc/retiolum/hosts
+mkdir -p /etc/tinc/retiolum/hosts
cp -v -r hosts/* /etc/tinc/retiolum/hosts
pkill -HUP tincd
pkill -ALRM tincd