/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to init.d-mandos

  • Committer: Teddy Hogeborn
  • Date: 2016-03-08 00:05:04 UTC
  • mfrom: (826 trunk)
  • mto: This revision was merged to the branch mainline in revision 827.
  • Revision ID: teddy@recompile.se-20160308000504-6m8f4c9kkfmgg686
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
init.d-mandos
77
77
        #   1 if daemon was already stopped
78
78
        #   2 if daemon could not be stopped
79
79
        #   other if a failure occurred
80
 
        start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
 
80
        start-stop-daemon --stop --quiet --pidfile $PIDFILE --name $NAME
 
81
        mandos-ctl >/dev/null 2>&1
 
82
        start-stop-daemon --stop --quiet --retry=30/KILL/5 --pidfile $PIDFILE --name $NAME
81
83
        RETVAL="$?"
82
84
        [ "$RETVAL" = 2 ] && return 2
83
85
        # Wait for children to finish too if this is a daemon that forks