/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 mandos-ctl

  • Committer: Teddy Hogeborn
  • Date: 2018-08-19 14:32:00 UTC
  • Revision ID: teddy@recompile.se-20180819143200-8j8sc2hv4ovjqo11
Remove workaround for old mkinitramfs-kpkg

* Makefile (install-client-nokey): Do not install
  "initramfs-tools-hook-conf".
* debian/control (mandos-client/Depends): Add "(>= 0.99)" to
  dependency on "initramfs-tools", since that is the version which
  removed mkinitramfs-kpkg.
* debian/mandos-client.dirs: Remove
  "usr/share/initramfs-tools/conf-hooks.d".
* initramfs-tools-hook-conf: Removed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
58
58
    "Interval": "Interval",
59
59
    "Host": "Host",
60
60
    "Fingerprint": "Fingerprint",
61
 
    "KeyID": "Key ID",
62
61
    "CheckerRunning": "Check Is Running",
63
62
    "LastEnabled": "Last Enabled",
64
63
    "ApprovalPending": "Approval Is Pending",
76
75
server_path = "/"
77
76
server_interface = domain + ".Mandos"
78
77
client_interface = domain + ".Mandos.Client"
79
 
version = "1.7.20"
 
78
version = "1.7.19"
80
79
 
81
80
 
82
81
try:
405
404
    if not has_actions(options) and clients:
406
405
        if options.verbose or options.dump_json:
407
406
            keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
408
 
                        "Created", "Interval", "Host", "KeyID",
409
 
                        "Fingerprint", "CheckerRunning",
410
 
                        "LastEnabled", "ApprovalPending",
411
 
                        "ApprovedByDefault", "LastApprovalRequest",
412
 
                        "ApprovalDelay", "ApprovalDuration",
413
 
                        "Checker", "ExtendedTimeout", "Expires",
 
407
                        "Created", "Interval", "Host", "Fingerprint",
 
408
                        "CheckerRunning", "LastEnabled",
 
409
                        "ApprovalPending", "ApprovedByDefault",
 
410
                        "LastApprovalRequest", "ApprovalDelay",
 
411
                        "ApprovalDuration", "Checker",
 
412
                        "ExtendedTimeout", "Expires",
414
413
                        "LastCheckerStatus")
415
414
        else:
416
415
            keywords = defaultkeywords