/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-07-24 01:35:55 UTC
  • Revision ID: teddy@recompile.se-20140724013555-zrgds2ft5cmwhugb
Fix two mutually cancelling bugs.

* mandos (rfc3339_duration_to_delta): Set "token_duration" to be a
                                      token (and not a tuple) by
                                      removing the final comma.
                                      Construct the needed tuple later
                                      when initializing the
                                      "followers" variable.
* mandos-ctl (rfc3339_duration_to_delta): - '' -

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
 
    update-initramfs -u -k all || :
 
34
    if [ -x /usr/sbin/update-initramfs ]; then
 
35
        update-initramfs -u -k all
 
36
    fi
35
37
}
36
38
 
37
39
case "$1" in
43
45
        shred --remove /etc/keys/mandos/seckey.txt 2>/dev/null || :
44
46
        rm --force /etc/mandos/plugin-runner.conf \
45
47
            /etc/keys/mandos/pubkey.txt \
46
 
            /etc/keys/mandos/seckey.txt \
47
 
            /etc/keys/mandos/tls-privkey.pem \
48
 
            /etc/keys/mandos/tls-pubkey.pem \
49
 
            /etc/keys/mandos/dhparams.pem 2>/dev/null
 
48
            /etc/keys/mandos/seckey.txt 2>/dev/null
50
49
        update_initramfs
51
50
        ;;
52
51
    upgrade|failed-upgrade|disappear|abort-install|abort-upgrade)