Fix broken upstream init script, drop chroot stuff from default config.

diff --git a/debian/rules b/debian/rules
index 6212bf6..1cfd3ad 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -67,7 +67,7 @@ binary-arch: install
        dh_link
        dh_strip
        dh_compress
-       mkdir -p debian/uanytun/usr/share/lintian/overrides/ 
+       mkdir -p debian/uanytun/usr/share/lintian/overrides/
        cp -av debian/overrides debian/uanytun/usr/share/lintian/overrides/uanytun
        dh_fixperms
        find debian/uanytun -type f -name config     -exec chmod 600 {} \;

diff --git a/debian/uanytun.default b/debian/uanytun.default
index 5e05210..d9d62c4 100644 (file)
--- a/debian/uanytun.default
+++ b/debian/uanytun.default
@@ -1,10 +1,5 @@
 # Defaults for uanytun initscript
 # sourced by /etc/init.d/uanytun
 
-# Note: chroot is tricky and not reliable yet. Use it only
-#       if you know what you're doing.
-#CHROOTDIR='/var/run/uanytun'
-#DAEMONOPTS="--chroot $CHROOTDIR --username nobody"
-
 # Additional options that are passed to the Daemon.
 DAEMONOPTS="--username uanytun"

diff --git a/etc/init.d/uanytun b/etc/init.d/uanytun
index 781e809..07cb448 100755 (executable)
--- a/etc/init.d/uanytun
+++ b/etc/init.d/uanytun
@@ -31,7 +31,7 @@ start_vpn () {
       test -d $CHROOTDIR || mkdir -p $CHROOTDIR
     fi
     DAEMONARG=`sed 's/#.*//' < $CONFIG_DIR/$NAME/config | grep -e '\w' | sed  's/^/--/' | tr '\n' ' '`
-    $DAEMON --write-pid /var/run/uanytun.$NAME.pid $POSTUP $DAEMONARG || STATUS="FAILED"
+    $DAEMON --write-pid /var/run/uanytun.$NAME.pid $POSTUP $DAEMONOPTS $DAEMONARG || STATUS="FAILED"
   else
     STATUS="no config found"
   fi