/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-03-03 22:09:38 UTC
  • Revision ID: teddy@recompile.se-20190303220938-92e8q07rtjdnpjh6
mandos-ctl: Refactor

* mandos-ctl (commands_and_clients_from_options): Take options as an
                                                  argument.  Move
                                                  parser setup into
                                                  new function and
                                                  move extra parse
                                                  checking into main.
  (add_command_line_options): New.
  (main): Create parser here and call add_command_line_options() to
          add options to it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-to-cryptroot-unlock
2
2
# 
3
3
# Script to get password from plugin-runner to cryptroot-unlock
4
4
# 
5
 
# Copyright © 2018-2019 Teddy Hogeborn
6
 
# Copyright © 2018-2019 Björn Påhlsson
 
5
# Copyright © 2018 Teddy Hogeborn
 
6
# Copyright © 2018 Björn Påhlsson
7
7
# 
8
8
# This file is part of Mandos.
9
9
# 
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 command -v cryptroot-unlock >/dev/null 2>&1; do
 
64
while type 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