3 files changed, 32 insertions, 22 deletions
diff --git a/retiolum/scripts/autostart/Makefile b/retiolum/scripts/autostart/Makefile
deleted file mode 100644
index aba6bd33..00000000
--- a/retiolum/scripts/autostart/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-INIT_FOLDER=/etc/init.d
-.phony: all
-debian:
-	#TODO change the tinc file before writing
-	cp tinc /etc/init.d/tinc
-	chmod +x /etc/init.d
-	echo "retiolum" > /etc/tinc/nets.boot
-	update-rc.d tinc defaults
-arch:
-	@cp tinc /etc/rc.d
-	@chmod +x /etc/rc.d/tinc
-	@echo "add tinc to DAEMONS in /etc/rc.conf"
-
-
diff --git a/retiolum/scripts/autostart/create-startup.sh b/retiolum/scripts/autostart/create-startup.sh
new file mode 100755
index 00000000..37edb972
--- /dev/null
+++ b/retiolum/scripts/autostart/create-startup.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+if test "${nosudo-false}" != true -a `id -u` != 0; then
+  echo "we're going sudo..." >&2
+  exec sudo "$0" "$@"
+  exit 23 # go to hell
+fi
+
+readlink="`readlink -f "$0"`"
+dirname="`dirname "$0"`"
+cd "$dirname"
+
+if [ -e /etc/init.d ];then
+  INIT_FOLDER=/etc/init.d 
+	update-rc.d tinc defaults #TODO debian specific
+else
+  INIT_FOLDER=/etc/rc.d
+	echo "add tinc to DAEMONS in /etc/rc.conf" #TODO archlinux specific
+fi
+
+echo "retiolum" > /etc/tinc/nets.boot
+cp -a tinc $INIT_FOLDER
diff --git a/retiolum/scripts/tinc_setup/install.sh b/retiolum/scripts/tinc_setup/install.sh
index 9df38df7..526dbe1f 100755
--- a/retiolum/scripts/tinc_setup/install.sh
+++ b/retiolum/scripts/tinc_setup/install.sh
@@ -1,11 +1,18 @@
 #! /bin/sh
 # USE WITH GREAT CAUTION
+set -eu
+
+if test "${nosudo-false}" != true -a `id -u` != 0; then
+  echo "we're going sudo..." >&2
+  exec sudo "$0" "$@"
+  exit 23 # go to hell
+fi
 
 #make -C ../../ update
 set -e
 DIRNAME=`dirname $0`
 CURR=`readlink -f ${DIRNAME}`
-MYBIN=../../bin
+MYBIN=${CURR}/../../bin
 netname=retiolum
 # create configuration directory for $netname
 mkdir -p /etc/tinc/$netname/hosts
@@ -30,18 +37,13 @@ then
   then
     echo "select v4 subnet ip (1-255) :"
     read v4num
-    myipv4=10.7.7.$v4num
-    if [  "$v4num" -gt 0 -a "$v4num" -lt "256" ];
-    then 
-      echo "check"
-    else
-      echo "you are made of stupid. bailing out" 
+    if ! $MYBIN/check-free-retiolum-v4 $v4num;then
       exit 1
     fi
   fi
   echo "Subnet = $myipv4" > hosts/$myname
 
-  myipv6=`${CURR}/../../bin/fillxx 42:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx`/128
+  myipv6=`$MYBIN/fillxx 42:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx`/128
   echo "Subnet = $myipv6" >> hosts/$myname
 else
   echo "own host file already exists! will not write again!"