diff options
| -rw-r--r-- | retiolum/Makefile | 6 | ||||
| -rwxr-xr-x | retiolum/bin/update-retiolum-hosts | 2 | ||||
| -rwxr-xr-x | retiolum/bin/update_tinc_hosts | 2 |
3 files changed, 6 insertions, 4 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 diff --git a/retiolum/bin/update_tinc_hosts b/retiolum/bin/update_tinc_hosts index b3529a7f..7be30c2a 100755 --- a/retiolum/bin/update_tinc_hosts +++ b/retiolum/bin/update_tinc_hosts @@ -17,7 +17,7 @@ es='# END OF RETIOLUM' case "${*-I am made of stupid}" in (start|restart) - hosts | grep -P "^(10|42)" | $0 replace magic + hosts | egrep "^(10|42)" | $0 replace magic ;; (stop) $0 clear magic |