nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "services: 'mingetty-service' no longer takes monadic values." 

This reverts commit daa48c3179.
This commit is contained in:
Ludovic Courtès 2015-09-13 12:04:55 +02:00
parent 82aa2a2879
commit 0081410da0
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/guix.texi
View File

@ -5699,7 +5699,7 @@ 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 @var{auto-login}, in which case the user will have to press a key before the
login shell is launched. 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 of the log-in program (the default is the @code{login} program from the Shadow
tool suite.) tool suite.)

17
gnu/services/base.scm
View File

@ -357,7 +357,7 @@ stopped before 'kill' is called."
(define* (mingetty-service tty (define* (mingetty-service tty
#:key #:key
(motd (plain-file "motd" "Welcome.\n")) (motd (text-file "motd" "Welcome.\n"))
auto-login auto-login
login-program login-program
login-pause? 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 @var{auto-login}, in which case the user will have to press a key before the
login shell is launched. 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 of the log-in program (the default is the @code{login} program from the Shadow
tool suite.) tool suite.)
@var{motd} is a file-like object to use as the ``message of the day''." @var{motd} is a monadic value containing a text file to use as
(with-monad %store-monad 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 (return
(service (service
(documentation (string-append "Run mingetty on " tty ".")) (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 (define %base-services
;; Convenience variable holding the basic 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"))) This is the GNU operating system, welcome!\n\n")))
(list (console-font-service "tty1") (list (console-font-service "tty1")
(console-font-service "tty2") (console-font-service "tty2")

4
gnu/system/linux.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; 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) (lambda* (name #:key allow-empty-passwords? motd)
"Return a standard Unix-style PAM service for NAME. When "Return a standard Unix-style PAM service for NAME. When
ALLOW-EMPTY-PASSWORDS? is true, allow empty passwords. When MOTD is true, it ALLOW-EMPTY-PASSWORDS? is true, allow empty passwords. When MOTD is true, it
should be a file-like object used as the message-of-the-day." should be the name of a file used as the message-of-the-day."
;; See <http://www.linux-pam.org/Linux-PAM-html/sag-configuration-example.html>. ;; See <http://www.linux-pam.org/Linux-PAM-html/sag-configuration-example.html>.
(let ((name* name)) (let ((name* name))
(pam-service (pam-service