diff options
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/base.scm | 8 | ||||
| -rw-r--r-- | gnu/services/databases.scm | 5 | ||||
| -rw-r--r-- | gnu/services/dbus.scm | 2 | ||||
| -rw-r--r-- | gnu/services/xorg.scm | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 9b3dc73831..b168543a65 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -29,7 +29,7 @@ #:use-module (gnu system file-systems) ; 'file-system', etc. #:use-module (gnu packages admin) #:use-module ((gnu packages linux) - #:select (eudev-with-blkid kbd e2fsprogs lvm2 fuse alsa-utils crda gpm)) + #:select (eudev kbd e2fsprogs lvm2 fuse alsa-utils crda gpm)) #:use-module ((gnu packages base) #:select (canonical-package glibc)) #:use-module (gnu packages package-management) @@ -733,9 +733,7 @@ the tty to run, among other things." (string-append dir "/lib")) (list #$@name-services)) ":"))))) - (stop #~(make-kill-destructor)) - - (respawn? #f))))) + (stop #~(make-kill-destructor)))))) (define nscd-activation ;; Actions to take before starting nscd. @@ -1170,7 +1168,7 @@ item of @var{packages}." (udev udev) (rules (append initial-rules rules))))))))) -(define* (udev-service #:key (udev eudev-with-blkid) (rules '())) +(define* (udev-service #:key (udev eudev) (rules '())) "Run @var{udev}, which populates the @file{/dev} directory dynamically. Get extra rules from the packages listed in @var{rules}." (service udev-service-type diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index 6c3b829df7..690375eb09 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 David Thompson <davet@gnu.org> -;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; ;;; This file is part of GNU Guix. @@ -56,6 +56,7 @@ host all all ::1/128 trust")) (define %default-postgres-config (mixed-text-file "postgresql.conf" + "log_destination = 'syslog'\n" "hba_file = '" %default-postgres-hba "'\n" "ident_file = '" %default-postgres-ident "'\n")) @@ -116,7 +117,7 @@ host all all ::1/128 trust")) (list (shepherd-service (provision '(postgres)) (documentation "Run the PostgreSQL daemon.") - (requirement '(user-processes loopback)) + (requirement '(user-processes loopback syslogd)) (start #~(make-forkexec-constructor #$start-script)) (stop #~(make-kill-destructor)))))))) diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm index cd1b5f4b8a..9a4a13d41d 100644 --- a/gnu/services/dbus.scm +++ b/gnu/services/dbus.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; ;;; This file is part of GNU Guix. diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index e16247b3b8..9908b9526b 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -250,7 +250,7 @@ which should be passed to this script as the first argument. If not, the ((_ x ..1) x)))) (if (file-exists? xsession-file) ;; Run ~/.xsession when it exists. - (exec-from-login-shell xsession-file session) + (apply exec-from-login-shell xsession-file session) ;; Otherwise, start the specified session. (apply exec-from-login-shell session))))) |