diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-02-14 00:20:28 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-02-14 00:20:28 +0100 |
| commit | 6901878894e9c6405fa811c512a32f448e8b9fa2 (patch) | |
| tree | 5b04c4234f4022533692c36a83047ec9801aada9 /gnu/services | |
| parent | baf766a7ff9db45c707b4539176f2143fbd90efd (diff) | |
| parent | 58c6a93d9d60660d8425d8c52d4b73a42d4a5b55 (diff) | |
| download | patches-6901878894e9c6405fa811c512a32f448e8b9fa2.tar patches-6901878894e9c6405fa811c512a32f448e8b9fa2.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/desktop.scm | 17 | ||||
| -rw-r--r-- | gnu/services/docker.scm | 5 | ||||
| -rw-r--r-- | gnu/services/xorg.scm | 2 |
3 files changed, 22 insertions, 2 deletions
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index fbeabf1162..a93fa3c356 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -39,6 +39,7 @@ #:use-module (gnu system pam) #:use-module (gnu packages glib) #:use-module (gnu packages admin) + #:use-module (gnu packages cups) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gnome) #:use-module (gnu packages xfce) @@ -802,6 +803,21 @@ accountsservice web site} for more information." ;;; +;;; cups-pk-helper service. +;;; + +(define cups-pk-helper-service-type + (service-type + (name 'cups-pk-helper) + (description + "PolicyKit helper to configure CUPS with fine-grained privileges.") + (extensions + (list (service-extension dbus-root-service-type list) + (service-extension polkit-service-type list))) + (default-value cups-pk-helper))) + + +;;; ;;; GNOME desktop service. ;;; @@ -990,6 +1006,7 @@ as expected."))) (udisks-service) (upower-service) (accountsservice-service) + (service cups-pk-helper-service-type) (colord-service) (geoclue-service) (service polkit-service-type) diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm index 09fe3cc1c3..8b5edf5cb0 100644 --- a/gnu/services/docker.scm +++ b/gnu/services/docker.scm @@ -71,13 +71,16 @@ (documentation "Docker daemon.") (provision '(dockerd)) (requirement '(containerd + dbus-system + elogind file-system-/sys/fs/cgroup/blkio file-system-/sys/fs/cgroup/cpu file-system-/sys/fs/cgroup/cpuset file-system-/sys/fs/cgroup/devices file-system-/sys/fs/cgroup/memory ; TODO: file-system-/sys/fs/cgroup/pids - )) + networking + udev)) (start #~(make-forkexec-constructor (list (string-append #$docker "/bin/dockerd") "-p" "/var/run/docker.pid") diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index d66254c03d..1efb275794 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -657,7 +657,7 @@ makes the good ol' XlockMore usable." "WaylandEnable=false\n" "\n" "[debug]\n" - "Enable=true\n" + "#Enable=true\n" "\n" "[security]\n" "#DisallowTCP=true\n" |