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:
parent
d7b49da4e6
commit
e53cefdf85
4 changed files with 22 additions and 5 deletions
10
debian/changelog
vendored
10
debian/changelog
vendored
|
@ -1,3 +1,13 @@
|
||||||
|
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.
|
||||||
|
|
||||||
|
-- Guus Sliepen <guus@debian.org> Thu, 05 Dec 2013 09:41:13 +0000
|
||||||
|
|
||||||
tinc (1.0.23-1) unstable; urgency=low
|
tinc (1.0.23-1) unstable; urgency=low
|
||||||
|
|
||||||
* New upstream release.
|
* New upstream release.
|
||||||
|
|
8
debian/tinc.if-post-down
vendored
8
debian/tinc.if-post-down
vendored
|
@ -4,8 +4,12 @@ set -e
|
||||||
|
|
||||||
if [ "$IF_TINC_NET" ] ; then
|
if [ "$IF_TINC_NET" ] ; then
|
||||||
EXTRA=""
|
EXTRA=""
|
||||||
[ -n "$IF_TINC_PIDFILE" ] && EXTRA="--pidfile=$IF_TINC_PIDFILE" || IF_TINC_PIDFILE=/var/run/tinc.$IF_TINC_NET.pid
|
if [ -n "$IF_TINC_PIDFILE" ]; then
|
||||||
tincd -n "$IF_TINC_NET" -k $EXTRA
|
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
|
sleep 0.1
|
||||||
i=0;
|
i=0;
|
||||||
while [ -f "$IF_TINC_PIDFILE" ] ; do
|
while [ -f "$IF_TINC_PIDFILE" ] ; do
|
||||||
|
|
4
debian/tinc.if-pre-up
vendored
4
debian/tinc.if-pre-up
vendored
|
@ -2,7 +2,9 @@
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
[ -z "$IF_TINC_NET" ] && exit 0
|
if [ -z "$IF_TINC_NET" ]; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
# Read options from /etc/default
|
# Read options from /etc/default
|
||||||
|
|
||||||
|
|
5
debian/tinc.if-up
vendored
5
debian/tinc.if-up
vendored
|
@ -2,7 +2,8 @@
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
[ "$METHOD" = loopback ] && exit 0
|
if [ "$METHOD" = loopback -o -n "$IF_TINC_NET" ]; then
|
||||||
[ -n "$IF_TINC_NET" ] && exit 0
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
invoke-rc.d tinc alarm || exit 0
|
invoke-rc.d tinc alarm || exit 0
|
||||||
|
|
Loading…
Reference in a new issue