diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-09-07 22:44:26 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-10-10 22:46:14 +0200 |
| commit | ce8a6dfc43265787c23fb93d3877fbcacb0451e4 (patch) | |
| tree | 97371c59b467d361d5c2b3b82864c9e8300f4d31 /gnu/system | |
| parent | b751cde36b508690d5f893360f964d3098549131 (diff) | |
| download | guix-ce8a6dfc43265787c23fb93d3877fbcacb0451e4.tar.gz | |
services: 'mingetty-service' no longer takes monadic values.
* gnu/services/base.scm (mingetty-service): Change default value of #:motd from a monadic value to a <plain-file>. Assume MOTD to be a file-like object. Assume LOGIN-PROGRAM is a gexp or #f. (%base-services): Use 'plain-file' instead of 'text-file' for motd. * gnu/system/linux.scm (unix-pam-service): Update docstring to mention that MOTD is a file-like object. * doc/guix.texi (Base Services): Adjust 'mingetty-service' documentation accordingly. * gnu/system/install.scm (installation-services): Adjust accordingly. (log-to-info): Use 'program-file' instead of 'gexp->script'.
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/install.scm | 4 | ||||
| -rw-r--r-- | gnu/system/linux.scm | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gnu/system/install.scm b/gnu/system/install.scm index c161526d77..dc5a47a293 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -102,7 +102,7 @@ under /root/.guix-profile where GUIX is installed." (define (log-to-info) "Return a script that spawns the Info reader on the right section of the manual." - (gexp->script "log-to-info" + (program-file "log-to-info" #~(begin ;; 'gunzip' is needed to decompress the doc. (setenv "PATH" (string-append #$gzip "/bin")) @@ -234,7 +234,7 @@ configuration template file in the installation system." (define (installation-services) "Return the list services for the installation image." - (let ((motd (text-file "motd" " + (let ((motd (plain-file "motd" " Welcome to the installation of the Guix System Distribution! There is NO WARRANTY, to the extent permitted by law. In particular, you may diff --git a/gnu/system/linux.scm b/gnu/system/linux.scm index 7461a4a61f..ac5005ebd1 100644 --- a/gnu/system/linux.scm +++ b/gnu/system/linux.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -136,7 +136,7 @@ dumped in /etc/pam.d/NAME, where NAME is the name of SERVICE." (lambda* (name #:key allow-empty-passwords? motd) "Return a standard Unix-style PAM service for NAME. When ALLOW-EMPTY-PASSWORDS? is true, allow empty passwords. When MOTD is true, it -should be the name of a file used as the message-of-the-day." +should be a file-like object used as the message-of-the-day." ;; See <http://www.linux-pam.org/Linux-PAM-html/sag-configuration-example.html>. (let ((name* name)) (pam-service |