summaryrefslogtreecommitdiffstats
path: root/etc/pacman.conf.in
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-06-04 16:19:28 +0200
committerDan McGee <dan@archlinux.org>2007-06-04 23:00:30 +0200
commita094deacf4f6abbef10c6acf38190d4fa9d34f0e (patch)
tree3a955b25ffc6db5c87e78e54c11d9368493901ab /etc/pacman.conf.in
parent029a8a9d44c6d6c9e86671e23b3d20018d8821e0 (diff)
downloadpacman-a094deacf4f6abbef10c6acf38190d4fa9d34f0e.tar.gz
pacman-a094deacf4f6abbef10c6acf38190d4fa9d34f0e.tar.xz
Start moving hardcoded paths out of libalpm
Move the defaults for RootDir, CacheDir, DBPath, and LockFile into pacman.conf, just as LogFile was done before. Add a section to alpm_parse_config to look for a LockFile directive. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'etc/pacman.conf.in')
-rw-r--r--etc/pacman.conf.in6
1 files changed, 5 insertions, 1 deletions
diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in
index 7960b9f3..bfc4265d 100644
--- a/etc/pacman.conf.in
+++ b/etc/pacman.conf.in
@@ -7,7 +7,11 @@
# GENERAL OPTIONS
#
[options]
-LogFile = /var/log/pacman.log
+RootDir = @ROOTDIR@
+DBPath = @localstatedir@/lib/pacman/
+CacheDir = @localstatedir@/cache/pacman/pkg/
+LockFile = @localstatedir@/run/pacman.lck
+LogFile = @localstatedir@/log/pacman.log
HoldPkg = pacman glibc
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u