diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-09-13 12:04:55 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-09-13 12:04:55 +0200 |
| commit | 0081410da011228ce0eef83f50b13bf70932fd3f (patch) | |
| tree | a27d52d4e2658231a5809e43de2848c754539e33 /gnu/services | |
| parent | 82aa2a28799f02e1a610d96bc592042c5e3786e4 (diff) | |
| download | patches-0081410da011228ce0eef83f50b13bf70932fd3f.tar patches-0081410da011228ce0eef83f50b13bf70932fd3f.tar.gz | |
Revert "services: 'mingetty-service' no longer takes monadic values."
This reverts commit daa48c31797b27e3a0991d0db7406c951ebc86df.
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/base.scm | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 865d461a1e..7f37b3da00 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 (plain-file "motd" "Welcome.\n")) + (motd (text-file "motd" "Welcome.\n")) auto-login login-program login-pause? @@ -374,12 +374,19 @@ 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 denoting the name +When true, @var{login-program} is a gexp or a monadic 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 file-like object to use as the ``message of the day''." - (with-monad %store-monad +@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)))) (return (service (documentation (string-append "Run mingetty on " tty ".")) @@ -854,7 +861,7 @@ gexp, to open it, and evaluate @var{close} to close it." (define %base-services ;; Convenience variable holding the basic services. - (let ((motd (plain-file "motd" " + (let ((motd (text-file "motd" " This is the GNU operating system, welcome!\n\n"))) (list (console-font-service "tty1") (console-font-service "tty2") |