Skip to content

Commit bbc0b07

Browse files
committed
IRC: cleaning up stop issues
let miniircd write PID, because of persmission drop fork.
1 parent 732fbb8 commit bbc0b07

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

piratebox/piratebox/init.d/piratebox

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,14 +200,14 @@ case "$1" in
200200

201201
. $CONF_IRC
202202

203-
IRC_PARMS="--setuid $IRC_USER --daemon --motd $IRC_MOTD "
203+
IRC_PARMS="--setuid $IRC_USER --daemon --motd $IRC_MOTD --pid-file $PIDFILE_IRC "
204204

205205
if [ ! -z "$IRC_STATEDIR" ] ; then
206206
IRC_PARMS=" $IRCPARMS --statedir $IRC_STATEDIR "
207207
fi
208208

209209
log_daemon_msg "Starting Miniircd..."
210-
start-stop-daemon -m -S -p $PIDFILE_IRC -x $PIRATEBOX/bin/miniircd.py -- $IRC_PARMS
210+
start-stop-daemon -S -x $PIRATEBOX/bin/miniircd.py -- $IRC_PARMS
211211
log_end_msg $?
212212
fi
213213
fi
@@ -223,7 +223,7 @@ case "$1" in
223223

224224
if [ "$ENABLE_IRC_SERVER" = "yes" ] ; then
225225
log_daemon_msg "Stopping IRC..."
226-
start-stop-daemon -K -q -p $PIDFILE_IRC
226+
start-stop-daemon -s 9 -K -q -p $PIDFILE_IRC
227227
log_end_msg $?
228228
fi
229229

piratebox/piratebox/init.d/piratebox_alt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,13 +192,13 @@ case "$1" in
192192
#Start IRC Server
193193
if [ "$ENABLE_IRC_SERVER" = "yes" ] ; then
194194
. $CONF_IRC
195-
IRC_PARMS="--setuid $IRC_USER --daemon --motd $IRC_MOTD "
195+
IRC_PARMS="--setuid $IRC_USER --daemon --motd $IRC_MOTD --pid-file $PIDFILE_IRC "
196196

197197
if [ ! -z "$IRC_STATEDIR" ] ; then
198198
IRC_PARMS=" $IRCPARMS --statedir $IRC_STATEDIR "
199199
fi
200200
echo "Starting Miniircd..."
201-
start-stop-daemon -m -S -p $PIDFILE_IRC -x $PIRATEBOX/bin/miniircd.py -- $IRC_PARMS
201+
start-stop-daemon -S -x $PIRATEBOX/bin/miniircd.py -- $IRC_PARMS
202202
echo $?
203203
fi
204204
fi
@@ -250,7 +250,7 @@ case "$1" in
250250

251251
if [ "$ENABLE_IRC_SERVER" = "yes" ] ; then
252252
echo "Stopping IRC..."
253-
start-stop-daemon -K -q -p $PIDFILE_IRC
253+
start-stop-daemon -s 9 -K -q -p $PIDFILE_IRC
254254
echo $?
255255
fi
256256

0 commit comments

Comments
 (0)