/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 plugins.d/splashy.xml

  • Committer: Teddy Hogeborn
  • Date: 2019-03-13 21:52:43 UTC
  • Revision ID: teddy@recompile.se-20190313215243-nq6o9hqve19qlwxe
mandos-ctl: Bug fix: Make --dump-json/-j work again.

* mandos-ctl (DumpJSONCmd.output): Don't do .values() on "clients".
  (TestDumpJSONCmd.test_normal, TestDumpJSONCmd.test_one_client): Call
  .values on clients dict before passing to output() method.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/splashy.xml
135
135
        <para>
136
136
          These variables will normally be inherited from
137
137
          <citerefentry><refentrytitle>plugin-runner</refentrytitle>
138
 
          <manvolnum>8mandos</manvolnum></citerefentry>, which might
139
 
          have in turn inherited them from its calling process.
 
138
          <manvolnum>8mandos</manvolnum></citerefentry>, which will
 
139
          normally have inherited them from
 
140
          <filename>/scripts/local-top/cryptroot</filename> in the
 
141
          initial <acronym>RAM</acronym> disk environment, which will
 
142
          have set them from parsing kernel arguments and
 
143
          <filename>/conf/conf.d/cryptroot</filename> (also in the
 
144
          initial RAM disk environment), which in turn will have been
 
145
          created when the initial RAM disk image was created by
 
146
          <filename
 
147
          >/usr/share/initramfs-tools/hooks/cryptroot</filename>, by
 
148
          extracting the information of the root file system from
 
149
          <filename >/etc/crypttab</filename>.
140
150
        </para>
141
151
        <para>
142
152
          This behavior is meant to exactly mirror the behavior of
266
276
    <para>
267
277
      <citerefentry><refentrytitle>intro</refentrytitle>
268
278
      <manvolnum>8mandos</manvolnum></citerefentry>,
 
279
      <citerefentry><refentrytitle>crypttab</refentrytitle>
 
280
      <manvolnum>5</manvolnum></citerefentry>,
269
281
      <citerefentry><refentrytitle>plugin-runner</refentrytitle>
270
282
      <manvolnum>8mandos</manvolnum></citerefentry>,
271
283
      <citerefentry><refentrytitle>proc</refentrytitle>