/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 dracut-module/password-agent.c

  • Committer: teddy at recompile
  • Date: 2020-02-05 21:39:28 UTC
  • mto: This revision was merged to the branch mainline in revision 396.
  • Revision ID: teddy@recompile.se-20200205213928-vpvt0fwfg47ikv6f
Allow users to alter ask-password-mandos.service

If a user uses dracut with systemd and wishes to modify the options
passed to password-agent(8mandos) or mandos-client(8mandos), they
should be able to do so by simply creating a file
/etc/systemd/system/ask-password-mandos.service.d/override.conf,
containing, for instance:

[Service]
Environment=MANDOS_CLIENT_OPTIONS=--debug

Adding PASSWORD_AGENT_OPTIONS should also be possible (but should not
normally be needed).

* dracut-module/ask-password-mandos.service ([Service]/ExecStart): Add
  $PASSWORD_AGENT_OPTIONS before "--" and "$MANDOS_CLIENT_OPTIONS" to
  end of line.
* dracut-module/module-setup.sh (install): Install all files named
  /etc/systemd/system/ask-password-mandos.service.d/*.conf if any
  exists.  Also add --dh-params before $MANDOS_CLIENT_OPTIONS instead
  of at end of line.

Show diffs side-by-side

added added

removed removed

Lines of Context:
8092
8092
  g_option_context_set_help_enabled(context, FALSE);
8093
8093
  g_option_context_set_ignore_unknown_options(context, TRUE);
8094
8094
 
8095
 
  gboolean run_tests = FALSE;
 
8095
  gboolean should_run_tests = FALSE;
8096
8096
  GOptionEntry entries[] = {
8097
8097
    { "test", 0, 0, G_OPTION_ARG_NONE,
8098
 
      &run_tests, "Run tests", NULL },
 
8098
      &should_run_tests, "Run tests", NULL },
8099
8099
    { NULL }
8100
8100
  };
8101
8101
  g_option_context_add_main_entries(context, entries, NULL);
8108
8108
  }
8109
8109
 
8110
8110
  g_option_context_free(context);
8111
 
  return run_tests != FALSE;
 
8111
  return should_run_tests != FALSE;
8112
8112
}