diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2010-01-04 13:45:14 +0100 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2010-01-04 13:45:14 +0100 |
| commit | c24f6ce22cd6720004addad2e3382b3caa6b1b7c (patch) | |
| tree | f9b6374f21ab733a633b52e0fc26bb4dac461aca /doc/apt-key.8.xml | |
| parent | 52643bec17df4e36a9bd27183886e2c0c7a8ebd8 (diff) | |
add TrustedParts so in the future new keyrings can just be dropped
into /etc/apt/trusted.gpg.d/ which eliminates the need to have
gpg installed to add keys to APTs trusted keyring (with apt-key)
(Closes #304846) - Thanks to Timo Weingärtner & Peter Palfrader
for providing different patchs/ideas for this!
Diffstat (limited to 'doc/apt-key.8.xml')
| -rw-r--r-- | doc/apt-key.8.xml | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index 7b0691b5e..8f445b7f9 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -26,7 +26,8 @@ <refsynopsisdiv> <cmdsynopsis> <command>apt-key</command> - <arg><replaceable>command</replaceable>/</arg> + <arg><option>--keyring <replaceable>filename</replaceable></option></arg> + <arg><replaceable>command</replaceable></arg> <arg rep="repeat"><option><replaceable>arguments</replaceable></option></arg> </cmdsynopsis> </refsynopsisdiv> @@ -135,11 +136,24 @@ </variablelist> </refsect1> + <refsect1><title>Options</title> +<para>Note that options need to be defined before the commands described in the previous section.</para> + <variablelist> + <varlistentry><term>--keyring <replaceable>filename</replaceable></term> + <listitem><para>With this option it is possible to specify a specific keyring + file the command should operate on. The default is that a command is executed + on the <filename>trusted.gpg</filename> file as well as on all parts in the + <filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</filename> + is the primary keyring which means that e.g. new keys are added to this one. + </para></listitem> + </varlistentry> + </variablelist> + </refsect1> + <refsect1><title>Files</title> <variablelist> - <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term> - <listitem><para>Keyring of local trusted keys, new keys will be added here.</para></listitem> - </varlistentry> + + &file-trustedgpg; <varlistentry><term><filename>/etc/apt/trustdb.gpg</filename></term> <listitem><para>Local trust database of archive keys.</para></listitem> @@ -153,8 +167,6 @@ <listitem><para>Keyring of Debian archive removed trusted keys.</para></listitem> </varlistentry> - - </variablelist> </refsect1> |