/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-to-cryptroot-unlock

  • Committer: Teddy Hogeborn
  • Date: 2019-07-28 14:39:47 UTC
  • Revision ID: teddy@recompile.se-20190728143947-gfv94wjdal3rgk6b
Update Python 3 compatibility

* mandos (gnutls.ClientSession.__init__): Use byte string argument to
                                          check_version() instead of a
                                          unicode string.
  (gnutls): - '' -
  (ClientHandler.handle): Change default values for "fpr" and "key_id"
                          to be byte strings instead of unicode
                          strings.
  (main): Use "key in dict" instead of "dict.has_key(key)".
* mandos-ctl: Fix Emacs test runner to use "--check" instead of
              "--test".
  (rfc3339_duration_to_delta): Change doctest string to not depend on
                               exact repr() string representation of
                               values and instead do value
                               comparisons.
  (parse_pre_1_6_1_interval): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
61
61
# Keep running plugin-runner and trying any password, until either a
62
62
# password is accepted by cryptroot-unlock, or plugin-runner fails, or
63
63
# the file /run/mandos-keep-running has been removed.
64
 
while type cryptroot-unlock >/dev/null 2>&1; do
 
64
while command -v cryptroot-unlock >/dev/null 2>&1; do
65
65
    /lib/mandos/plugin-runner > "$passfile" &
66
66
    echo $! > /run/mandos-plugin-runner.pid
67
67
    wait %% || break