/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-client.postrm

  • Committer: Teddy Hogeborn
  • Date: 2015-08-10 07:34:37 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 325.
  • Revision ID: teddy@recompile.se-20150810073437-3m8jgt13nqric6vf
Revert change to D-Bus API.

The D-Bus API signal CheckerCompleted is documented to provide a
wait(2) status value.  Since the server switched to using subprocess
to run checkers, it no longer has access to a wait(2) status value.  A
previous change to work around this made the D-Bus API incompatible.
Revert this change by constructing a fake wait(2) status value; this
keeps the D-Bus API stable.

* DBUS-API (CheckerCompleted): Revert incompatible change.
* mandos (ClientDBus.checker_callback): Construct fake wait(2) status.
* mandos-monitor (MandosClientWidget.checker_completed): Revert to
                                                         using
                                                         original API
                                                         with wait(2)
                                                         condition
                                                         value.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/mandos-client.postrm
1
 
#!/bin/sh -e
 
1
#!/bin/sh
2
2
# This script can be called in the following ways:
3
3
#
4
4
# After the package was removed:
26
26
# If preinst fails during upgrade:
27
27
#       <new-postrm> abort-upgrade <old-version>
28
28
 
 
29
set -e
29
30
 
30
31
# Update the initial RAM file system image
31
32
update_initramfs()
32
33
{
33
 
    if [ -x /usr/sbin/update-initramfs ]; then
34
 
        update-initramfs -u -k all
35
 
    fi
 
34
    update-initramfs -u -k all || :
36
35
}
37
36
 
38
37
case "$1" in
44
43
        shred --remove /etc/keys/mandos/seckey.txt 2>/dev/null || :
45
44
        rm --force /etc/mandos/plugin-runner.conf \
46
45
            /etc/keys/mandos/pubkey.txt \
47
 
            /etc/keys/mandos/seckey.txt 2>/dev/null
 
46
            /etc/keys/mandos/seckey.txt \
 
47
            /etc/keys/mandos/dhparams.pem 2>/dev/null
 
48
        update_initramfs
48
49
        ;;
49
50
    upgrade|failed-upgrade|disappear|abort-install|abort-upgrade)
50
51
        ;;