Only create pid dir if we are about to start Tor (Luca Capello, closes: #447508)

svn:r12085
This commit is contained in:
Peter Palfrader 2007-10-21 22:12:24 +00:00
parent 4a8cf7b517
commit bacbf984ca
2 changed files with 20 additions and 9 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
tor (0.2.0.8-alpha-1+svn) experimentalX; urgency=low
* Only create pid dir if we are about to start Tor (Luca Capello,
closes: #447508).
-- Peter Palfrader <weasel@debian.org> Mon, 22 Oct 2007 00:11:15 +0200
tor (0.2.0.8-alpha-1) experimental; urgency=low
* New upstream version.

22
debian/tor.init vendored
View File

@ -61,16 +61,18 @@ wait_for_deaddaemon () {
}
if test ! -d $TORPIDDIR; then
echo "There is no $TORPIDDIR directory. Creating one for you."
mkdir -m 02700 "$TORPIDDIR"
chown debian-tor:debian-tor "$TORPIDDIR"
fi
check_torpiddir () {
if test ! -d $TORPIDDIR; then
echo "There is no $TORPIDDIR directory. Creating one for you."
mkdir -m 02700 "$TORPIDDIR"
chown debian-tor:debian-tor "$TORPIDDIR"
fi
if test ! -x $TORPIDDIR; then
echo "Cannot access $TORPIDDIR directory, are you root?" >&2
exit 1
fi
if test ! -x $TORPIDDIR; then
echo "Cannot access $TORPIDDIR directory, are you root?" >&2
exit 1
fi
}
case "$1" in
@ -89,6 +91,8 @@ case "$1" in
fi
fi
check_torpiddir
echo "Starting $DESC: $NAME..."
if ! su -s /bin/sh -c "$DAEMON --verify-config" debian-tor > /dev/null; then
echo "ABORTED: Tor configuration invalid:" >&2