diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-09-07 22:44:26 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-09-13 11:54:56 +0200 |
| commit | daa48c31797b27e3a0991d0db7406c951ebc86df (patch) | |
| tree | accb8b1bfcbcf5d27b3b93b7223947090f8d8392 /gnu/services | |
| parent | 5fbbd29f747ce0483ad53cb4b83101fc8a5eeb44 (diff) | |
| download | patches-daa48c31797b27e3a0991d0db7406c951ebc86df.tar patches-daa48c31797b27e3a0991d0db7406c951ebc86df.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.
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/base.scm | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 7f37b3da00..865d461a1e 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -357,7 +357,7 @@ stopped before 'kill' is called." (define* (mingetty-service tty #:key - (motd (text-file "motd" "Welcome.\n")) + (motd (plain-file "motd" "Welcome.\n")) auto-login login-program login-pause? @@ -374,19 +374,12 @@ automatically. @var{login-pause?} can be set to @code{#t} in conjunction with @var{auto-login}, in which case the user will have to press a key before the login shell is launched. -When true, @var{login-program} is a gexp or a monadic gexp denoting the name +When true, @var{login-program} is a gexp denoting the name of the log-in program (the default is the @code{login} program from the Shadow tool suite.) -@var{motd} is a monadic value containing a text file to use as -the ``message of the day''." - (mlet %store-monad ((motd motd) - (login-program (cond ((gexp? login-program) - (return login-program)) - ((not login-program) - (return #f)) - (else - login-program)))) +@var{motd} is a file-like object to use as the ``message of the day''." + (with-monad %store-monad (return (service (documentation (string-append "Run mingetty on " tty ".")) @@ -861,7 +854,7 @@ gexp, to open it, and evaluate @var{close} to close it." (define %base-services ;; Convenience variable holding the basic services. - (let ((motd (text-file "motd" " + (let ((motd (plain-file "motd" " This is the GNU operating system, welcome!\n\n"))) (list (console-font-service "tty1") (console-font-service "tty2") |