summaryrefslogtreecommitdiffstats
path: root/retiolum/Makefile
diff options
context:
space:
mode:
authorMomo <momorientes@online.de>2011-09-01 12:17:21 +0200
committerMomo <momorientes@online.de>2011-09-01 12:17:21 +0200
commitff0030cd7fe92a09173c16bf7b483cde638dab46 (patch)
tree33c1cd58756ea023eb304a1504b3a079a7eae63a /retiolum/Makefile
parent77d4efad2e89fe9357b10b1bd173fbded82468fe (diff)
parentabf8674a3fc02f172768be911c6e719290bf6bd5 (diff)
Merge branch 'master' of https://github.com/krebscode/painload
Diffstat (limited to 'retiolum/Makefile')
-rw-r--r--retiolum/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/retiolum/Makefile b/retiolum/Makefile
index 407d8c60..c80a6faa 100644
--- a/retiolum/Makefile
+++ b/retiolum/Makefile
@@ -8,9 +8,10 @@ links:
for x in $(EXES); do ln -vsnf ../retiolum/bin/$$x ../bin; done
hosts:
- bin/update-retiolum-hosts
+ bin/update-retiolum-hosts || true
install: update
+ @#punani -Ei tinc python
@# will not run automatically
scripts/tinc_setup/install.sh
scripts/autostart/create-startup.sh
@@ -18,10 +19,10 @@ install: update
update: hosts
@echo creating Magic
bin/update_tinc_hosts "create magic" || true
- @echo adding hosts
+ @echo adding hosts
bin/update_tinc_hosts restart
arch-install: update install arch-autostart autohosts
arch-autostart:
- make -C scripts/autostart arch
+ make -C scripts/autostart arch || true