Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Georg Koppen
Tor
Commits
3e452fed
Commit
3e452fed
authored
20 years ago
by
Peter Palfrader
Browse files
Options
Downloads
Patches
Plain Diff
Wait for tor to die in init stop. Let the user know if it doesn't
svn:r1223
parent
ee3ed492
No related branches found
Branches containing commit
Tags
tor-0.3.5.10
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
debian/changelog
+2
-1
2 additions, 1 deletion
debian/changelog
debian/tor.init
+59
-10
59 additions, 10 deletions
debian/tor.init
with
61 additions
and
11 deletions
debian/changelog
+
2
−
1
View file @
3e452fed
...
...
@@ -5,8 +5,9 @@ tor (0.0.1+0.0.2pre24-1) unstable; urgency=low
* Add "# ulimit -c unlimited" to tor.default
* Always enable DataDirectory.
* Actually use dpatch now (to modify upstream torrc.in)
* Wait for tor to die in init stop. Let the user know if it doesn't.
-- Peter Palfrader <weasel@debian.org> Wed, 3 Mar 2004 1
3:48:09
+0100
-- Peter Palfrader <weasel@debian.org> Wed, 3 Mar 2004 1
4:10:25
+0100
tor (0.0.1+0.0.2pre23-1) unstable; urgency=low
...
...
This diff is collapsed.
Click to expand it.
debian/tor.init
+
59
−
10
View file @
3e452fed
#! /bin/sh
set
-e
PATH
=
/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON
=
/usr/sbin/tor
NAME
=
tor
DESC
=
"tor daemon"
TORLOG
=
/var/log/tor/log
TORPID
=
/var/run/tor/tor.pid
DEFAULTSFILE
=
/etc/default/
$NAME
WAITFORDAEMON
=
10
ARGS
=
"--pidfile
$TORPID
--logfile
$TORLOG
--runasdaemon 1"
test
-x
$DAEMON
||
exit
0
# Include tor defaults if available
if
[
-f
/etc/default/tor
]
;
then
.
/etc/default/tor
if
[
-f
$DEFAULTSFILE
]
;
then
.
$DEFAULTSFILE
fi
set
-e
wait_for_deaddaemon
()
{
pid
=
$1
sleep
1
if
test
-n
"
$pid
"
then
if
kill
-0
$pid
2>/dev/null
then
echo
-n
"."
cnt
=
0
while
kill
-0
$pid
2>/dev/null
do
cnt
=
`
expr
$cnt
+ 1
`
if
[
$cnt
-gt
$WAITFORDAEMON
]
then
echo
" FAILED."
return
1
fi
sleep
1
echo
-n
"."
done
fi
fi
return
0
}
case
"
$1
"
in
start
)
if
[
"
$RUN_DAEMON
"
!=
"yes"
]
;
then
echo
"Not starting
$DESC
(Disabled in
/etc/default/tor
)."
echo
"Not starting
$DESC
(Disabled in
$DEFAULTSFILE
)."
else
echo
-n
"Starting
$DESC
: "
start-stop-daemon
--start
--quiet
--oknodo
\
...
...
@@ -32,14 +59,36 @@ case "$1" in
;;
stop
)
echo
-n
"Stopping
$DESC
: "
start-stop-daemon
--stop
--quiet
--oknodo
--pidfile
$TORPID
\
--exec
$DAEMON
echo
"
$NAME
."
pid
=
`
cat
$TORPID
2>/dev/null
`
||
true
if
test
!
-f
$TORPID
-o
-z
"
$pid
"
then
echo
"not running (there is no
$TORPID
)."
elif
start-stop-daemon
--stop
--quiet
--pidfile
$TORPID
--exec
$DAEMON
then
wait_for_deaddaemon
$pid
echo
"
$NAME
."
elif
kill
-0
$pid
2>/dev/null
then
echo
"FAILED (Is
$pid
not
$NAME
? Is
$DAEMON
a different binary now?)."
else
echo
"FAILED (
$DAEMON
died: process
$pid
not running)."
fi
;;
reload|force-reload
)
echo
"Reloading
$DESC
configuration."
start-stop-daemon
--stop
--signal
1
--oknodo
--quiet
--pidfile
$TORPID
\
--exec
$DAEMON
echo
-n
"Reloading
$DESC
configuration: "
pid
=
`
cat
$TORPID
2>/dev/null
`
||
true
if
test
!
-f
$TORPID
-o
-z
"
$pid
"
then
echo
"not running (there is no
$TORPID
)."
elif
start-stop-daemon
--stop
--signal
1
--quiet
--pidfile
$TORPID
--exec
$DAEMON
then
echo
"
$NAME
."
elif
kill
-0
$pid
2>/dev/null
then
echo
"FAILED (Is
$pid
not
$NAME
? Is
$DAEMON
a different binary now?)."
else
echo
"FAILED (
$DAEMON
died: process
$pid
not running)."
fi
;;
restart
)
$0
stop
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment