/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-keygen.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:
mandos-keygen.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-keygen">
5
 
<!ENTITY TIMESTAMP "2011-10-03">
 
5
<!ENTITY TIMESTAMP "2013-10-22">
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>2011</year>
 
37
      <year>2012</year>
37
38
      <holder>Teddy Hogeborn</holder>
38
39
      <holder>Björn Påhlsson</holder>
39
40
    </copyright>
226
227
        <replaceable>TYPE</replaceable></option></term>
227
228
        <listitem>
228
229
          <para>
229
 
            Key type.  Default is <quote>DSA</quote>.
 
230
            Key type.  Default is <quote>RSA</quote>.
230
231
          </para>
231
232
        </listitem>
232
233
      </varlistentry>
238
239
        <replaceable>BITS</replaceable></option></term>
239
240
        <listitem>
240
241
          <para>
241
 
            Key length in bits.  Default is 2048.
 
242
            Key length in bits.  Default is 4096.
242
243
          </para>
243
244
        </listitem>
244
245
      </varlistentry>
250
251
        <replaceable>KEYTYPE</replaceable></option></term>
251
252
        <listitem>
252
253
          <para>
253
 
            Subkey type.  Default is <quote>ELG-E</quote> (Elgamal
 
254
            Subkey type.  Default is <quote>RSA</quote> (Elgamal
254
255
            encryption-only).
255
256
          </para>
256
257
        </listitem>
263
264
        <replaceable>BITS</replaceable></option></term>
264
265
        <listitem>
265
266
          <para>
266
 
            Subkey length in bits.  Default is 2048.
 
267
            Subkey length in bits.  Default is 4096.
267
268
          </para>
268
269
        </listitem>
269
270
      </varlistentry>
287
288
        <replaceable>TEXT</replaceable></option></term>
288
289
        <listitem>
289
290
          <para>
290
 
            Comment field for key.  The default value is
291
 
            <quote><literal>Mandos client key</literal></quote>.
 
291
            Comment field for key.  Default is empty.
292
292
          </para>
293
293
        </listitem>
294
294
      </varlistentry>