aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author宋文武 <iyzsong@gmail.com>2015-01-22 21:14:33 +0800
committer宋文武 <iyzsong@gmail.com>2015-01-23 12:24:54 +0800
commite1626e3b3ae6d8eb3e118af4ffe9d905b1642ede (patch)
tree8a380aca7c7d7b673e0bbac5e50a9874e36efc00
parent8c9267a4482fb364a39f9a7eaed78cd6d3acd51a (diff)
downloadguix-e1626e3b3ae6d8eb3e118af4ffe9d905b1642ede.tar
guix-e1626e3b3ae6d8eb3e118af4ffe9d905b1642ede.tar.gz
gnu: sudo: Set rundir, vardir and iologdir.
* gnu/packages/admin.scm (sudo)[arguments]<#:configure-flags>: Add --with-rundir=/run/sudo --with-vardir=/var/db/sudo --with-iologdir=/var/log/sudo-io.
-rw-r--r--gnu/packages/admin.scm13
1 files changed, 11 insertions, 2 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index d7cd0b8092..534fd070ff 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -631,7 +631,10 @@ system administrator.")
"002l6h27pnhb77b65frhazbhknsxvrsnkpi43j7i0qw1lrgi7nkf"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags '("--with-logpath=/var/log/sudo.log")
+ `(#:configure-flags '("--with-logpath=/var/log/sudo.log"
+ "--with-rundir=/run/sudo"
+ "--with-vardir=/var/db/sudo"
+ "--with-iologdir=/var/log/sudo-io")
#:phases (alist-cons-before
'configure 'pre-configure
(lambda _
@@ -645,7 +648,13 @@ system administrator.")
"")
(("^install: (.*)install-sudoers(.*)" _ before after)
;; Don't try to create /etc/sudoers.
- (string-append "install: " before after "\n"))))
+ (string-append "install: " before after "\n"))
+ (("\\$\\(DESTDIR\\)\\$\\(rundir\\)")
+ ;; Don't try to create /run/sudo.
+ "$(TMPDIR)/dummy")
+ (("\\$\\(DESTDIR\\)\\$\\(vardir\\)")
+ ;; Don't try to create /var/db/sudo.
+ "$(TMPDIR)/dummy")))
%standard-phases)
;; XXX: The 'testsudoers' test series expects user 'root' to exist, but