Import Debian changes 1.0.23-2

tinc (1.0.23-2) unstable; urgency=low

  * Use if-statements instead of && in shell scripts. Closes: #731279
    The && operator does not clear the error status, and if the next statement
    in a shell script does not change the error status it would cause the
    script to prematurely exit. Thanks to Peter Reinholdtsen for spotting it.
  * Use absolute path to tincd in the if-post-down script.
This commit is contained in:
Guus Sliepen 2013-12-05 09:41:13 +00:00
parent d7b49da4e6
commit e53cefdf85
4 changed files with 22 additions and 5 deletions

View file

@ -4,8 +4,12 @@ set -e
if [ "$IF_TINC_NET" ] ; then
EXTRA=""
[ -n "$IF_TINC_PIDFILE" ] && EXTRA="--pidfile=$IF_TINC_PIDFILE" || IF_TINC_PIDFILE=/var/run/tinc.$IF_TINC_NET.pid
tincd -n "$IF_TINC_NET" -k $EXTRA
if [ -n "$IF_TINC_PIDFILE" ]; then
EXTRA="--pidfile=$IF_TINC_PIDFILE"
else
IF_TINC_PIDFILE=/var/run/tinc.$IF_TINC_NET.pid
fi
/usr/sbin/tincd -n "$IF_TINC_NET" -k $EXTRA
sleep 0.1
i=0;
while [ -f "$IF_TINC_PIDFILE" ] ; do