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

  • Committer: Teddy Hogeborn
  • Date: 2019-08-03 11:39:38 UTC
  • mto: This revision was merged to the branch mainline in revision 386.
  • Revision ID: teddy@recompile.se-20190803113938-httj8rqsnct08txx
dracut-module/password-agent.c: Bug fix: Ignore deleted files

If a question file ("ask.*") is opened, deleted, and then closed, we
still get an IN_CLOSE_WRITE ievent after the IN_DELETE ievent.  We
should pass the IN_EXCL_UNLINK flag to inotify_add_watch() to avoid
this.

* dracut-module/password-agent.c (add_inotify_dir_watch): Add
  "IN_EXCL_UNLINK" flag to inotify_add_watch().
  (test_add_inotify_dir_watch_IN_EXCL_UNLINK): New test.
  (run_tests): Add new test.

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