/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: 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:
mandos-ctl
38
38
import re
39
39
import os
40
40
import collections
41
 
import doctest
42
41
import json
43
42
 
44
43
import dbus
345
344
        parser.error("--all requires an action.")
346
345
 
347
346
    if options.check:
 
347
        import doctest
348
348
        fail_count, test_count = doctest.testmod()
349
349
        sys.exit(os.EX_OK if fail_count == 0 else 1)
350
350