Merge remote branch 'origin/maint-0.2.2'

This commit is contained in:
Nick Mathewson 2011-03-09 16:20:14 -05:00
commit 19baca4837
2 changed files with 11 additions and 0 deletions

3
changes/bug2574 Normal file
View File

@ -0,0 +1,3 @@
o Minor packaging issues
- Create the /var/run/tor directory on startup on OpenSUSE if it is
not already created. Patch from Andreas Stieger. Fixes bug 2574.

View File

@ -51,6 +51,8 @@ export TORUSER
TORGROUP=@TORGROUP@
export TORGROUP
TOR_DAEMON_PID_DIR="@LOCALSTATEDIR@/run/tor"
if [ -x /bin/su ] ; then
SUPROG=/bin/su
elif [ -x /sbin/su ] ; then
@ -67,6 +69,12 @@ case "$1" in
start)
echo "Starting tor daemon"
if [ ! -d $TOR_DAEMON_PID_DIR ] ; then
mkdir -p $TOR_DAEMON_PID_DIR
chown $TORUSER:$TORGROUP $TOR_DAEMON_PID_DIR
fi
## Start daemon with startproc(8). If this fails
## the echo return value is set appropriate.