/mandos/release

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

« back to all changes in this revision

Viewing changes to init.d-mandos

  • Committer: Teddy Hogeborn
  • Date: 2013-12-14 03:11:30 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 307.
  • Revision ID: teddy@recompile.se-20131214031130-xicrtjuxxttgqazf
http://bugs.debian.org/731618
Switch from avahi to avahi-daemon in initscript LSB dependencies

* init.d-mandos (Required-Start, Required-Stop):
  Change "avahi" to "avahi-daemon".

Reported-by: Laurent Bigonville <bigon@debian.org>
Suggested-by: Laurent Bigonville <bigon@debian.org>

Show diffs side-by-side

added added

removed removed

Lines of Context:
init.d-mandos
44
44
. /lib/init/vars.sh
45
45
 
46
46
# Define LSB log_* functions.
47
 
# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
48
 
# and status_of_proc is working.
 
47
# Depend on lsb-base (>= 3.2-14) to ensure that this file is present.
49
48
. /lib/lsb/init-functions
50
49
 
51
50
#
77
76
        #   1 if daemon was already stopped
78
77
        #   2 if daemon could not be stopped
79
78
        #   other if a failure occurred
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
 
79
        start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
83
80
        RETVAL="$?"
84
81
        [ "$RETVAL" = 2 ] && return 2
85
82
        # Wait for children to finish too if this is a daemon that forks
125
122
                2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
126
123
        esac
127
124
        ;;
128
 
  status)
129
 
        status_of_proc "$DAEMON" "$NAME" -p "$PIDFILE" && exit 0 || exit $?
130
 
        ;;
131
125
  #reload|force-reload)
132
126
        #
133
127
        # If do_reload() is not implemented then leave this commented out
154
148
                esac
155
149
                ;;
156
150
          *)
157
 
                # Failed to stop
 
151
                # Failed to stop
158
152
                log_end_msg 1
159
153
                ;;
160
154
        esac
161
155
        ;;
 
156
  status)
 
157
        status_of_proc "$DAEMON" "$NAME" -p "$PIDFILE"
 
158
        ;;
162
159
  *)
163
160
        #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
164
 
        echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
 
161
        echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
165
162
        exit 3
166
163
        ;;
167
164
esac