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

Merge from Teddy:

Bug fixes: Make D-Bus properties settable again, and handle checkers
for disabled clients correctly.

* mandos (ClientDBus.notifychangeproperty/setter): Bug fix: pass
                                                   variant_level as a
                                                   keyword argument.
  (ClientDBus.Timeout_dbus_property): Bug fix: call function
                                      _timedelta_to_milliseconds in
                                      its new position as a global
                                      function.
  (Client.checked_ok): Bug fix: Handle disabled client.
* mandos-ctl (main): Bug fix: Handle empty strings correctly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/mandos.postinst
35
35
                --disabled-password --gecos "Mandos password system" \
36
36
                _mandos
37
37
        fi
38
 
        chown _mandos:_mandos /var/lib/mandos
39
38
        ;;
40
 
    
 
39
 
41
40
    abort-upgrade|abort-deconfigure|abort-remove)
42
41
        ;;
43
 
    
 
42
 
44
43
    *)
45
44
        echo "$0 called with unknown argument '$1'" 1>&2
46
45
        exit 1
47
46
        ;;
48
47
esac
49
48
 
50
 
# Avahi version 0.6.31-2 and older provides "avahi" (instead of
51
 
# "avahi-daemon") in its /etc/init.d script header.  To make
52
 
# insserv(8) happy, we edit our /etc/init.d script header to contain
53
 
# the correct string before the code added by dh_installinit calls
54
 
# update.rc-d, which calls insserv.
55
 
avahi_version="`dpkg-query --showformat='${Version}' --show avahi-daemon`"
56
 
if dpkg --compare-versions "$avahi_version" le 0.6.31-2; then
57
 
    sed --in-place --expression='/^### BEGIN INIT INFO$/,/^### END INIT INFO$/s/^\(# Required-\(Stop\|Start\):.*avahi\)-daemon\>/\1/g' /etc/init.d/mandos
58
 
fi
59
 
 
60
49
#DEBHELPER#
61
50
 
62
51
exit 0