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

  • Committer: Teddy Hogeborn
  • Date: 2017-09-03 09:06:09 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 362.
  • Revision ID: teddy@recompile.se-20170903090609-y6vqe6bpaedeeyvu
Plymouth plugin: Try the newest PID file location

* plugins.d/plymouth.c (plymouth_old_pid): Rename to
  "plymouth_old_old_pid".
  (plymouth_pid): Rename to "plymouth_old_pid".
  (plymouth_pid): New.
  (get_pid): Also check plymouth_old_old_pid.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/mandos-client.postinst
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 "$@"
93
 
        if dpkg --compare-versions "$2" lt-nl "1.7.7-1"; then
 
94
        if dpkg --compare-versions "$2" lt-nl "1.7.10-1"; then
94
95
            PLUGINHELPERDIR=/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)/mandos/plugin-helpers
95
96
            if ! dpkg-statoverride --list "$PLUGINHELPERDIR" \
96
97
                 >/dev/null 2>&1; then
97
98
                chmod u=rwx,go= -- "$PLUGINHELPERDIR"
98
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
99
104
        fi
100
105
        ;;
101
106
    abort-upgrade|abort-deconfigure|abort-remove)