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) | |
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 c161526d772..dc5a47a293e 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm | |||
| @@ -102,7 +102,7 @@ under /root/.guix-profile where GUIX is installed." | |||
| 102 | (define (log-to-info) | 102 | (define (log-to-info) |
| 103 | "Return a script that spawns the Info reader on the right section of the | 103 | "Return a script that spawns the Info reader on the right section of the |
| 104 | manual." | 104 | manual." |
| 105 | (gexp->script "log-to-info" | 105 | (program-file "log-to-info" |
| 106 | #~(begin | 106 | #~(begin |
| 107 | ;; 'gunzip' is needed to decompress the doc. | 107 | ;; 'gunzip' is needed to decompress the doc. |
| 108 | (setenv "PATH" (string-append #$gzip "/bin")) | 108 | (setenv "PATH" (string-append #$gzip "/bin")) |
| @@ -234,7 +234,7 @@ configuration template file in the installation system." | |||
| 234 | 234 | ||
| 235 | (define (installation-services) | 235 | (define (installation-services) |
| 236 | "Return the list services for the installation image." | 236 | "Return the list services for the installation image." |
| 237 | (let ((motd (text-file "motd" " | 237 | (let ((motd (plain-file "motd" " |
| 238 | Welcome to the installation of the Guix System Distribution! | 238 | Welcome to the installation of the Guix System Distribution! |
| 239 | 239 | ||
| 240 | There is NO WARRANTY, to the extent permitted by law. In particular, you may | 240 | 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 7461a4a61fd..ac5005ebd18 100644 --- a/gnu/system/linux.scm +++ b/gnu/system/linux.scm | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | 1 | ;;; GNU Guix --- Functional package management for GNU |
| 2 | ;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> | 2 | ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> |
| 3 | ;;; | 3 | ;;; |
| 4 | ;;; This file is part of GNU Guix. | 4 | ;;; This file is part of GNU Guix. |
| 5 | ;;; | 5 | ;;; |
| @@ -136,7 +136,7 @@ dumped in /etc/pam.d/NAME, where NAME is the name of SERVICE." | |||
| 136 | (lambda* (name #:key allow-empty-passwords? motd) | 136 | (lambda* (name #:key allow-empty-passwords? motd) |
| 137 | "Return a standard Unix-style PAM service for NAME. When | 137 | "Return a standard Unix-style PAM service for NAME. When |
| 138 | ALLOW-EMPTY-PASSWORDS? is true, allow empty passwords. When MOTD is true, it | 138 | ALLOW-EMPTY-PASSWORDS? is true, allow empty passwords. When MOTD is true, it |
| 139 | should be the name of a file used as the message-of-the-day." | 139 | should be a file-like object used as the message-of-the-day." |
| 140 | ;; See <http://www.linux-pam.org/Linux-PAM-html/sag-configuration-example.html>. | 140 | ;; See <http://www.linux-pam.org/Linux-PAM-html/sag-configuration-example.html>. |
| 141 | (let ((name* name)) | 141 | (let ((name* name)) |
| 142 | (pam-service | 142 | (pam-service |
