diff options
| author | Pang Yan Han <pangyanhan@gmail.com> | 2011-05-28 16:37:32 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-06-01 19:13:43 +0200 |
| commit | fe9804a96d9e50a44e549c7be9189152e20893c5 (patch) | |
| tree | 1ce786ce7560cb1269818a8aae20b2d2411458c7 | |
| parent | 7b261675801822a1c5922dd982f012f91dd737f8 (diff) | |
| download | pacman-fe9804a96d9e50a44e549c7be9189152e20893c5.tar.gz pacman-fe9804a96d9e50a44e549c7be9189152e20893c5.tar.xz | |
Update pacman manpage and pacman.conf for gpgdir
pacman.8.txt --gpgdir section is updated based on the pacman.conf manpage
pacman.conf is updated to include the default GPGDir
Signed-off-by: Pang Yan Han <pangyanhan@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | doc/pacman.8.txt | 11 | ||||
| -rw-r--r-- | etc/pacman.conf.in | 1 |
2 files changed, 7 insertions, 5 deletions
diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 6270dbd8..3b92d193 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -150,11 +150,12 @@ Options to be used. *\--gpgdir* <dir>:: - Specify a directory of files used by GnuPG to verify package signatures. - This directory should contain two files: `pubring.gpg` and `trustdb.gpg`. - `pubring.gpg` holds the public keys of all packagers. `trustdb.gpg` - contains a so-called trust database, which specifies that the keys are - authentic and trusted. + Specify a directory of files used by GnuPG to verify package signatures (a + typical default is +{sysconfdir}/pacman.d/gnupg+). This directory should contain + two files: `pubring.gpg` and `trustdb.gpg`. `pubring.gpg` holds the public keys + of all packagers. `trustdb.gpg` contains a so-called trust database, which + specifies that the keys are authentic and trusted. *NOTE*: this is an absolute + path, the root path is not automatically prepended. *\--logfile* <file>:: Specify an alternate log file. This is an absolute path, regardless of diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 7b8501c7..1d49fd71 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -13,6 +13,7 @@ #DBPath = @localstatedir@/lib/pacman/ #CacheDir = @localstatedir@/cache/pacman/pkg/ #LogFile = @localstatedir@/log/pacman.log +#GPGDir = @sysconfdir@/pacman.d/gnupg/ HoldPkg = pacman glibc # If upgrades are available for these packages they will be asked for first SyncFirst = pacman |