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

  • Committer: Teddy Hogeborn
  • Date: 2014-06-15 01:01:14 UTC
  • Revision ID: teddy@recompile.se-20140615010114-fzz32p5naoo8nket
mandos-client: Better error messages.

* Makefile (run-client): Update message to match current messages.
                         Also set GNOME_KEYRING_CONTROL to empty
                         string to block pam_gnome_keyring.
* plugins.d/mandos-client (raise_privileges): Do not print errors.
  (raise_privileges_permanently): - '' -
  (lower_privileges): - '' -
  (lower_privileges_permanently): - '' -
  (run_network_hooks): Print errors from above functions correctly.
  (bring_up_interface, take_down_interface, main): - '' -

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
 
# Update the initramfs
 
31
# Update the initial RAM file system image
31
32
update_initramfs()
32
33
{
33
 
        if type update-initramfs >/dev/null 2>&1 ; then
34
 
                update-initramfs -u -k all
35
 
        fi
 
34
    if [ -x /usr/sbin/update-initramfs ]; then
 
35
        update-initramfs -u -k all
 
36
    fi
36
37
}
37
38
 
38
 
 
39
39
case "$1" in
40
40
    remove)
41
41
        update_initramfs
42
42
        ;;
43
43
 
44
44
    purge)
45
 
        shred --remove /etc/keys/mandos/seckey.txt || :
 
45
        shred --remove /etc/keys/mandos/seckey.txt 2>/dev/null || :
46
46
        rm --force /etc/mandos/plugin-runner.conf \
47
47
            /etc/keys/mandos/pubkey.txt \
48
 
            /etc/keys/mandos/seckey.txt
49
 
        rmdir /etc/keys/mandos /etc/mandos/plugins.d /etc/mandos || :
 
48
            /etc/keys/mandos/seckey.txt 2>/dev/null
 
49
        update_initramfs
50
50
        ;;
51
51
    upgrade|failed-upgrade|disappear|abort-install|abort-upgrade)
52
52
        ;;
53
53
 
54
54
    *)
55
 
        echo "$0 called with unknown argument \`$1'" 1>&2
 
55
        echo "$0 called with unknown argument '$1'" 1>&2
56
56
        exit 1
57
57
        ;;
58
58
esac