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

  • Committer: Teddy Hogeborn
  • Date: 2017-08-20 14:41:20 UTC
  • Revision ID: teddy@recompile.se-20170820144120-ee0hsyhvo1geg8ms
Handle multiple lines better in cryptroot file.

* initramfs-tools-script: Avoid running plugin-runner more than once
  if the root file system device is specially marked in the cryptroot
  file.  Also never run plugin-runner for a resume (usually swap)
  device.

Show diffs side-by-side

added added

removed removed

Lines of Context:
57
57
        return 0
58
58
    fi
59
59
    mandos-keygen
 
60
    gpg-connect-agent KILLAGENT /bye || :
60
61
}
61
62
 
62
63
create_dh_params(){
90
91
        create_key "$@"
91
92
        create_dh_params "$@" || :
92
93
        update_initramfs "$@"
 
94
        if dpkg --compare-versions "$2" lt-nl "1.7.10-1"; then
 
95
            PLUGINHELPERDIR=/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)/mandos/plugin-helpers
 
96
            if ! dpkg-statoverride --list "$PLUGINHELPERDIR" \
 
97
                 >/dev/null 2>&1; then
 
98
                chmod u=rwx,go= -- "$PLUGINHELPERDIR"
 
99
            fi
 
100
            if ! dpkg-statoverride --list /etc/mandos/plugin-helpers \
 
101
                 >/dev/null 2>&1; then
 
102
                chmod u=rwx,go= -- /etc/mandos/plugin-helpers
 
103
            fi
 
104
        fi
93
105
        ;;
94
106
    abort-upgrade|abort-deconfigure|abort-remove)
95
107
        ;;