Merge branch 'master' of github.com:krebscode/painload

3 files changed, 9 insertions, 3 deletions

diff --git a/retiolum/bin/hosts b/retiolum/bin/hosts
index 6939f52c..bd0c77dc 100755
--- a/retiolum/bin/hosts
+++ b/retiolum/bin/hosts
@@ -6,6 +6,8 @@ netname=${1-retiolum}
 cd /etc/tinc/$netname/hosts
 
 for i in `ls`; do
-  sed -rn 's|^ *Subnet *= *([^ /]*)(/[0-9]*)? *$|\1\t'$i' '$i'.'$netname'|p' $i
+  sed -n '
+    s|^ *Subnet *= *\([^ /]*\)\(/[0-9]*\)\? *$|\1\t'$i' '$i'.'$netname'|p
+  ' $i
 done | sort
 
diff --git a/retiolum/bin/ipv6 b/retiolum/bin/ipv6
index 65a1eaa1..34c6de71 100755
--- a/retiolum/bin/ipv6
+++ b/retiolum/bin/ipv6
@@ -13,7 +13,7 @@ if test `id -u` != 0; then
 fi
 
 file=/etc/tinc/retiolum/hosts/`hostname`
-addr=`sed -rn 's|^Subnet *= *(42:[0-9A-Fa-f:]*/128)|\1|p' $file`
+addr=`sed -n 's|^Subnet *= *\(42:[0-9A-Fa-f:]*/128\)|\1|p' $file`
 route=42::/16
 
 start() {
diff --git a/retiolum/bin/update_tinc_hosts b/retiolum/bin/update_tinc_hosts
index fe0785e3..86a28992 100755
--- a/retiolum/bin/update_tinc_hosts
+++ b/retiolum/bin/update_tinc_hosts
@@ -29,9 +29,13 @@ case "${*-I am made of stupid}" in
     ;;
   ('create magic')
     $0 has magic || $0 print magic >> $hosts < /dev/null
+    $0 start
     ;;
   ('destroy magic')
-    $0 has magic && sed -ie "/^$bs$/,/^$es$/d" $hosts 
+    if $0 has magic; then
+      cache="`cat $hosts`"
+      echo "$cache" | sed "/^$bs$/,/^$es$/d" > $hosts 
+    fi
     ;;
   ('has magic')
     grep -q "^$bs$" $hosts && grep -q "^$es$" $hosts