/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 debian/mandos.prerm

  • Committer: Teddy Hogeborn
  • Date: 2011-11-26 23:08:17 UTC
  • mto: (518.1.8 mandos-persistent)
  • mto: This revision was merged to the branch mainline in revision 524.
  • Revision ID: teddy@recompile.se-20111126230817-tv08v831s2yltbkd
Make "enabled" a client config option.

* DBUS-API: Fix wording on "Expires" option.
* clients.conf (enabled): New.
* mandos (Client): "last_enabled" can now be None.
  (Client.__init__): Get "enabled" from config.  Only set
                     "last_enabled" and "expires" if enabled.
  (ClientDBus.Created_dbus_property): Removed redundant dbus.String().
  (ClientDBus.Interval_dbus_property): If changed, only reschedule
                                       checker if enabled.
  (main/special_settings): Added "enabled".
* mandos-clients.conf (OPTIONS): Added "enabled".

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/mandos.prerm
17
17
 
18
18
case "$1" in
19
19
    remove|deconfigure)
20
 
        invoke-rc.d mandos stop || :
 
20
        if [ -x /etc/init.d/mandos ]; then
 
21
                if [ -x /usr/sbin/invoke-rc.d ]; then
 
22
                        invoke-rc.d mandos stop
 
23
                else
 
24
                        /etc/init.d/mandos stop
 
25
                fi
 
26
        fi
21
27
        ;;
22
28
    upgrade|failed-upgrade)
23
29
        ;;