/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/mandos-client.xml

  • Committer: Teddy Hogeborn
  • Date: 2013-10-28 08:38:47 UTC
  • Revision ID: teddy@recompile.se-20131028083847-cper3srg5o29r2ge
Use architecture libdir.

Instead of always using /usr/lib/mandos, use whatever the architecture
specifies, like /usr/lib/x86_64-linux-gnu/mandos or /usr/lib64/mandos.
Still use /usr/lib/mandos as a fallback.

* Makefile (LIBDIR): New.
 (install-client-nokey, uninstall-client): Use LIBDIR instead of
                                           $(PREFIX)/lib.
* initramfs-tools-hook: Detect correct libdir and copy from there.

Reported-by: Nathanael D. Noblet <nathanael@gnat.ca>
Suggested-by: Nathanael D. Noblet <nathanael@gnat.ca>

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/mandos-client.xml
2
2
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
3
3
        "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
4
4
<!ENTITY COMMANDNAME "mandos-client">
5
 
<!ENTITY TIMESTAMP "2012-06-13">
 
5
<!ENTITY TIMESTAMP "2013-10-20">
6
6
<!ENTITY % common SYSTEM "../common.ent">
7
7
%common;
8
8
]>
34
34
      <year>2008</year>
35
35
      <year>2009</year>
36
36
      <year>2012</year>
 
37
      <year>2013</year>
37
38
      <holder>Teddy Hogeborn</holder>
38
39
      <holder>Björn Påhlsson</holder>
39
40
    </copyright>
226
227
      
227
228
      <varlistentry>
228
229
        <term><option>--interface=<replaceable
229
 
        >NAME</replaceable></option></term>
 
230
        >NAME</replaceable><arg rep='repeat'>,<replaceable
 
231
        >NAME</replaceable></arg></option></term>
230
232
        <term><option>-i
231
 
        <replaceable>NAME</replaceable></option></term>
 
233
        <replaceable>NAME</replaceable><arg rep='repeat'>,<replaceable
 
234
        >NAME</replaceable></arg></option></term>
232
235
        <listitem>
233
236
          <para>
234
237
            Comma separated list of network interfaces that will be
237
240
            use all appropriate interfaces.
238
241
          </para>
239
242
          <para>
240
 
            If the <option>--connect</option> option is used, this
241
 
            specifies the interface to use to connect to the address
242
 
            given.
 
243
            If the <option>--connect</option> option is used, and
 
244
            exactly one interface name is specified (except
 
245
            <quote><literal>none</literal></quote>), this specifies
 
246
            the interface to use to connect to the address given.
243
247
          </para>
244
248
          <para>
245
249
            Note that since this program will normally run in the
254
258
          </para>
255
259
          <para>
256
260
            <replaceable>NAME</replaceable> can be the string
257
 
            <quote><literal>none</literal></quote>; this will not use
258
 
            any specific interface, and will not bring up an interface
259
 
            on startup.  This is not recommended, and only meant for
260
 
            advanced users.
 
261
            <quote><literal>none</literal></quote>; this will make
 
262
            <command>&COMMANDNAME;</command> not bring up
 
263
            <emphasis>any</emphasis> interfaces specified
 
264
            <emphasis>after</emphasis> this string.  This is not
 
265
            recommended, and only meant for advanced users.
261
266
          </para>
262
267
        </listitem>
263
268
      </varlistentry>
508
513
              It is not necessary to print any non-executable files
509
514
              already in the network hook directory, these will be
510
515
              copied implicitly if they otherwise satisfy the name
511
 
              requirement.
 
516
              requirements.
512
517
            </para>
513
518
          </listitem>
514
519
        </varlistentry>
662
667
    </para>
663
668
    <informalexample>
664
669
      <para>
665
 
        Normal invocation needs no options, if the network interface
 
670
        Normal invocation needs no options, if the network interfaces
666
671
        can be automatically determined:
667
672
      </para>
668
673
      <para>
671
676
    </informalexample>
672
677
    <informalexample>
673
678
      <para>
674
 
        Search for Mandos servers (and connect to them) using another
675
 
        interface:
 
679
        Search for Mandos servers (and connect to them) using one
 
680
        specific interface:
676
681
      </para>
677
682
      <para>
678
683
        <!-- do not wrap this line -->
842
847
              <para>
843
848
                This client uses IPv6 link-local addresses, which are
844
849
                immediately usable since a link-local addresses is
845
 
                automatically assigned to a network interfaces when it
 
850
                automatically assigned to a network interface when it
846
851
                is brought up.
847
852
              </para>
848
853
            </listitem>