/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: 2019-08-10 15:19:47 UTC
  • Revision ID: teddy@recompile.se-20190810151947-wyw7cetrh1pvtw37
Simplification of Python 3 compatibility code

Normally, "class Foo:" in Python 2 creates a "classic" class, but in
Python 3, all classes are "new-style" classes, which you can get in
Python 2 by doing "class Foo(object):", i.e. inheriting from "object".
But, you can also get a new-style classes from "class Foo:" in Python
2 by setting the global "__metaclass__" variable to "type", which
makes the code less cluttered.  Note: it is still necessary to inherit
from "object" in Python 2 to get a new-style class if the class is
otherwise inheriting only from "classic" classes.

* mandos: Set "__metaclass__ = type" globally for Python 2, and remove
          inheriting from "object" in all places possible.
* mandos-ctl: - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
31
31
# Update the initial RAM file system image
32
32
update_initramfs()
33
33
{
34
 
    if [ -x /usr/sbin/update-initramfs ]; then
35
 
        update-initramfs -u -k all
 
34
    if command -v update-initramfs >/dev/null; then
 
35
        update-initramfs -k all -u
 
36
    elif command -v dracut >/dev/null; then
 
37
        # Logic taken from dracut.postinst
 
38
        for kernel in /boot/vmlinu[xz]-*; do
 
39
            kversion="${kernel#/boot/vmlinu[xz]-}"
 
40
            if [ "$kversion" != "*" ]; then
 
41
                /etc/kernel/postinst.d/dracut "$kversion"
 
42
            fi
 
43
        done
36
44
    fi
37
45
}
38
46
 
45
53
        shred --remove /etc/keys/mandos/seckey.txt 2>/dev/null || :
46
54
        rm --force /etc/mandos/plugin-runner.conf \
47
55
            /etc/keys/mandos/pubkey.txt \
48
 
            /etc/keys/mandos/seckey.txt 2>/dev/null
 
56
            /etc/keys/mandos/seckey.txt \
 
57
            /etc/keys/mandos/tls-privkey.pem \
 
58
            /etc/keys/mandos/tls-pubkey.pem \
 
59
            /etc/keys/mandos/dhparams.pem 2>/dev/null
49
60
        update_initramfs
50
61
        ;;
51
62
    upgrade|failed-upgrade|disappear|abort-install|abort-upgrade)