diff options
author | Mark H Weaver <mhw@netris.org> | 2014-09-11 18:26:28 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2014-09-11 18:26:28 -0400 |
commit | 66ea98e321e93b0806f6870d77dd4c00e7e720c0 (patch) | |
tree | 21778401485e3b8683bbc6a31769233c059683b1 /gnu/system/linux.scm | |
parent | da5538ef44bfa74d3e435f9f557374eabba5dc1e (diff) | |
parent | 5dae0186dea1e72e73bf223161620cfeddef5a63 (diff) | |
download | guix-66ea98e321e93b0806f6870d77dd4c00e7e720c0.tar.gz |
Merge branch 'master' into core-updates
Conflicts: gnu/packages/image.scm
Diffstat (limited to 'gnu/system/linux.scm')
-rw-r--r-- | gnu/system/linux.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/system/linux.scm b/gnu/system/linux.scm index 524ad01261..8cddedf28e 100644 --- a/gnu/system/linux.scm +++ b/gnu/system/linux.scm @@ -175,7 +175,8 @@ authenticate to run COMMAND." ;; These programs are setuid-root. (map (cut unix-pam-service <> #:allow-empty-passwords? allow-empty-passwords?) - '("su" "passwd" "sudo")) + '("su" "passwd" "sudo" + "xlock" "xscreensaver")) ;; These programs are not setuid-root, and we want root to be able ;; to run them without having to authenticate (notably because |