ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: Add login-service.

Browse source 
* gnu/services/base.scm (%default-motd, <login-configuration>,
  login-pam-service, login-serivce-type, login-service): New variables.
  (<mingetty-configuration>, mingetty-shepherd-service,
  mingetty-serivce-type): Remove motd. Remove allow-empty-passwords?.
  Remove mingetty-pam-service.
  (%base-services): Add login-service. Remove motd.
This commit is contained in:
David Craven 2016-09-06 15:58:49 +02:00
parent 381000d794
commit 317d3b474a
No known key found for this signature in database
GPG key ID: C5E051C79C0BECDB
2 changed files with 93 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
doc/guix.texi
View file

@ -6753,8 +6753,7 @@ following in your operating system declaration:
(extra-options '("--gc-keep-derivations"))))
(mingetty-service-type config =>
(mingetty-configuration
(inherit config)
(motd (plain-file "motd" "Howdy!"))))))
(inherit config)))))
(operating-system
;; @dots{}
@ -7619,6 +7618,27 @@ this:
Return a service that sets the host name to @var{name}.
@end deffn
@deffn {Scheme Procedure} login-service @var{config}
Return a service to run login according to @var{config}, a
@code{<login-configuration>} object, which specifies the message of the day,
among other things.
@end deffn
@deftp {Data Type} login-configuration
This is the data type representing the configuration of login.
@table @asis
@item @code{motd}
A file-like object containing the ``message of the day''.
@item @code{allow-empty-passwords?} (default: @code{#t})
Allow empty passwords by default so that first-time users can log in when
the 'root' account has just been created.
@end table
@end deftp
@deffn {Scheme Procedure} mingetty-service @var{config}
Return a service to run mingetty according to @var{config}, a
@code{<mingetty-configuration>} object, which specifies the tty to run, among
@ -7634,9 +7654,6 @@ implements console log-in.
@item @code{tty}
The name of the console this Mingetty runs on---e.g., @code{"tty1"}.
@item @code{motd}
A file-like object containing the ``message of the day''.
@item @code{auto-login} (default: @code{#f})
When true, this field must be a string denoting the user name under
which the system automatically logs in. When it is @code{#f}, a

125
gnu/services/base.scm
View file

@ -66,6 +66,11 @@ (define-module (gnu services base)
udev-service
udev-rule
login-configuration
login-configuration?
login-service-type
login-service
mingetty-configuration
mingetty-configuration?
mingetty-service
@ -656,41 +661,55 @@ (define* (console-font-service tty #:optional (font "LatGrkCyr-8x16"))
;; codepoints notably found in the UTF-8 manual.
(service console-font-service-type (list tty font)))
(define %default-motd
(plain-file "motd" "This is the GNU operating system, welcome!\n\n"))
(define-record-type* <login-configuration>
login-configuration make-login-configuration
login-configuration?
(motd login-configuration-motd ;file-like
(default %default-motd))
;; Allow empty passwords by default so that first-time users can log in when
;; the 'root' account has just been created.
(allow-empty-passwords? login-configuration-allow-empty-passwords?
(default #t))) ;Boolean
(define (login-pam-service config)
"Return the list of PAM service needed for CONF."
;; Let 'login' be known to PAM.
(list (unix-pam-service "login"
#:allow-empty-passwords?
(login-configuration-allow-empty-passwords? config)
#:motd
(login-configuration-motd config))))
(define login-service-type
(service-type (name 'login)
(extensions (list (service-extension pam-root-service-type
login-pam-service)))))
(define* (login-service #:optional (config (login-configuration)))
"Return a service configure login according to @var{config}, which specifies
the message of the day, among other things."
(service login-service-type config))
(define-record-type* <mingetty-configuration>
mingetty-configuration make-mingetty-configuration
mingetty-configuration?
(mingetty mingetty-configuration-mingetty ;<package>
(default mingetty))
(tty mingetty-configuration-tty) ;string
(motd mingetty-configuration-motd ;file-like
(default (plain-file "motd" "Welcome.\n")))
(auto-login mingetty-auto-login ;string | #f
(default #f))
(login-program mingetty-login-program ;gexp
(default #f))
(login-pause? mingetty-login-pause? ;Boolean
(default #f))
;; Allow empty passwords by default so that first-time users can log in when
;; the 'root' account has just been created.
(allow-empty-passwords? mingetty-configuration-allow-empty-passwords?
(default #t))) ;Boolean
(define (mingetty-pam-service conf)
"Return the list of PAM service needed for CONF."
;; Let 'login' be known to PAM. All the mingetty services will have that
;; PAM service, but that's fine because they're all identical and duplicates
;; are removed.
(list (unix-pam-service "login"
#:allow-empty-passwords?
(mingetty-configuration-allow-empty-passwords? conf)
#:motd
(mingetty-configuration-motd conf))))
(default #f)))
(define mingetty-shepherd-service
(match-lambda
(($ <mingetty-configuration> mingetty tty motd auto-login login-program
login-pause? allow-empty-passwords?)
(($ <mingetty-configuration> mingetty tty auto-login login-program
login-pause?)
(list
(shepherd-service
(documentation "Run mingetty on an tty.")
@ -718,9 +737,7 @@ (define mingetty-shepherd-service
(define mingetty-service-type
(service-type (name 'mingetty)
(extensions (list (service-extension shepherd-root-service-type
mingetty-shepherd-service)
(service-extension pam-root-service-type
mingetty-pam-service)))))
mingetty-shepherd-service)))))
(define* (mingetty-service config)
"Return a service to run mingetty according to @var{config}, which specifies
@ -1435,38 +1452,38 @@ (define* (gpm-service #:key (gpm gpm)
(define %base-services
;; Convenience variable holding the basic services.
(let ((motd (plain-file "motd" "
This is the GNU operating system, welcome!\n\n")))
(list (console-font-service "tty1")
(console-font-service "tty2")
(console-font-service "tty3")
(console-font-service "tty4")
(console-font-service "tty5")
(console-font-service "tty6")
(list (login-service)
(mingetty-service (mingetty-configuration
(tty "tty1") (motd motd)))
(mingetty-service (mingetty-configuration
(tty "tty2") (motd motd)))
(mingetty-service (mingetty-configuration
(tty "tty3") (motd motd)))
(mingetty-service (mingetty-configuration
(tty "tty4") (motd motd)))
(mingetty-service (mingetty-configuration
(tty "tty5") (motd motd)))
(mingetty-service (mingetty-configuration
(tty "tty6") (motd motd)))
(console-font-service "tty1")
(console-font-service "tty2")
(console-font-service "tty3")
(console-font-service "tty4")
(console-font-service "tty5")
(console-font-service "tty6")
(static-networking-service "lo" "127.0.0.1"
#:provision '(loopback))
(syslog-service)
(urandom-seed-service)
(guix-service)
(nscd-service)
(mingetty-service (mingetty-configuration
(tty "tty1")))
(mingetty-service (mingetty-configuration
(tty "tty2")))
(mingetty-service (mingetty-configuration
(tty "tty3")))
(mingetty-service (mingetty-configuration
(tty "tty4")))
(mingetty-service (mingetty-configuration
(tty "tty5")))
(mingetty-service (mingetty-configuration
(tty "tty6")))
;; The LVM2 rules are needed as soon as LVM2 or the device-mapper is
;; used, so enable them by default. The FUSE and ALSA rules are
;; less critical, but handy.
(udev-service #:rules (list lvm2 fuse alsa-utils crda)))))
(static-networking-service "lo" "127.0.0.1"
#:provision '(loopback))
(syslog-service)
(urandom-seed-service)
(guix-service)
(nscd-service)
;; The LVM2 rules are needed as soon as LVM2 or the device-mapper is
;; used, so enable them by default. The FUSE and ALSA rules are
;; less critical, but handy.
(udev-service #:rules (list lvm2 fuse alsa-utils crda))))
;;; base.scm ends here