From b26365186045530eadb5027087a37ca1a440aee9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 29 Aug 2015 23:37:33 +0200 Subject: doc: Mention the "normalized codeset" used in locale names. * doc/guix.texi (Locales): Introduce "codeset". <%default-locale-definitions>: Mention the "normalized codeset", with an xref to libc's manual. * gnu/system/locale.scm (%default-locale-definitions)[utf8-locale]: Mention the "normalized codeset" in a comment. --- gnu/system/locale.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/system') diff --git a/gnu/system/locale.scm b/gnu/system/locale.scm index be9abcb81d..393dd42354 100644 --- a/gnu/system/locale.scm +++ b/gnu/system/locale.scm @@ -83,6 +83,8 @@ (letrec-syntax ((utf8-locale (syntax-rules () ((_ name*) (locale-definition + ;; Note: We choose "utf8", which is the + ;; "normalized codeset". (name (string-append name* ".utf8")) (source name*) (charset "UTF-8"))))) -- cgit 1.4.1 From 1ce6f43a6baaad37783784b55b8ccb7bb224873c Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Thu, 3 Sep 2015 11:23:30 +0300 Subject: gnu: wpa-supplicant-light: Rename to wpa-supplicant-minimal. * gnu/packages/admin.scm (wpa-supplicant-light): Rename to ... (wpa-supplicant-minimal): ...this. (wpa-supplicant): Use it. * gnu/system/install.scm (installation-os): Use it. --- gnu/packages/admin.scm | 10 +++++----- gnu/system/install.scm | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/system') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 53cf65e11a..70b2bb2c8f 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -703,9 +703,9 @@ commands and their arguments.") ;; See . (license license:x11))) -(define-public wpa-supplicant-light +(define-public wpa-supplicant-minimal (package - (name "wpa-supplicant-light") + (name "wpa-supplicant-minimal") (version "2.4") (source (origin (method url-fetch) @@ -795,12 +795,12 @@ This package provides the 'wpa_supplicant' daemon and the 'wpa_cli' command.") (license license:bsd-3))) (define-public wpa-supplicant - (package (inherit wpa-supplicant-light) + (package (inherit wpa-supplicant-minimal) (name "wpa-supplicant") (inputs `(("dbus" ,dbus) - ,@(package-inputs wpa-supplicant-light))) + ,@(package-inputs wpa-supplicant-minimal))) (arguments - (substitute-keyword-arguments (package-arguments wpa-supplicant-light) + (substitute-keyword-arguments (package-arguments wpa-supplicant-minimal) ((#:phases phases) `(alist-cons-after 'configure 'configure-for-dbus diff --git a/gnu/system/install.scm b/gnu/system/install.scm index e7e5d4ae9d..9314462f30 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -344,7 +344,7 @@ Use Alt-F2 for documentation. parted ddrescue grub ;mostly so xrefs to its manual work cryptsetup - wireless-tools iw wpa-supplicant-light iproute + wireless-tools iw wpa-supplicant-minimal iproute ;; XXX: We used to have GNU fdisk here, but as of version ;; 2.0.0a, that pulls Guile 1.8, which takes unreasonable ;; space; furthermore util-linux's fdisk is already -- cgit 1.4.1 From 14454f0bc55326897feffec9496d61d0fd1da8cb Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 3 Sep 2015 16:58:08 -0400 Subject: file-systems: Add %elogind-file-systems; add it to %base-file-systems. * gnu/system/file-systems.scm (%elogind-file-systems): New variable. (%base-file-systems): Add %elogind-file-systems. --- gnu/system/file-systems.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/system') diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm index 003eb443d1..b177f93398 100644 --- a/gnu/system/file-systems.scm +++ b/gnu/system/file-systems.scm @@ -50,6 +50,7 @@ %devtmpfs-file-system %immutable-store %control-groups + %elogind-file-systems %base-file-systems %container-file-systems @@ -258,6 +259,26 @@ UUID representation." '("cpuset" "cpu" "cpuacct" "memory" "devices" "freezer" "blkio" "perf_event" "hugetlb"))))) +(define %elogind-file-systems + ;; We don't use systemd, but these file systems are needed for elogind, + ;; which was extracted from systemd. + (list (file-system + (device "none") + (mount-point "/run/systemd") + (type "tmpfs") + (check? #f) + (flags '(no-suid no-dev no-exec)) + (options "mode=0755") + (create-mount-point? #t)) + (file-system + (device "none") + (mount-point "/run/user") + (type "tmpfs") + (check? #f) + (flags '(no-suid no-dev no-exec)) + (options "mode=0755") + (create-mount-point? #t)))) + (define %base-file-systems ;; List of basic file systems to be mounted. Note that /proc and /sys are ;; currently mounted by the initrd. @@ -265,6 +286,7 @@ UUID representation." %pseudo-terminal-file-system %shared-memory-file-system %immutable-store) + %elogind-file-systems %control-groups)) ;; File systems for Linux containers differ from %base-file-systems in that -- cgit 1.4.1 From daa48c31797b27e3a0991d0db7406c951ebc86df Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 7 Sep 2015 22:44:26 +0200 Subject: 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 . 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. --- doc/guix.texi | 2 +- gnu/services/base.scm | 17 +++++------------ gnu/system/linux.scm | 4 ++-- 3 files changed, 8 insertions(+), 15 deletions(-) (limited to 'gnu/system') diff --git a/doc/guix.texi b/doc/guix.texi index 9ae91a8d1e..59d60bc263 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -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 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.) 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") diff --git a/gnu/system/linux.scm b/gnu/system/linux.scm index 7461a4a61f..ac5005ebd1 100644 --- a/gnu/system/linux.scm +++ b/gnu/system/linux.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015 Ludovic Courtès ;;; ;;; 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) "Return a standard Unix-style PAM service for NAME. When ALLOW-EMPTY-PASSWORDS? is true, allow empty passwords. When MOTD is true, it -should be the name of a file used as the message-of-the-day." +should be a file-like object used as the message-of-the-day." ;; See . (let ((name* name)) (pam-service -- cgit 1.4.1 From 0081410da011228ce0eef83f50b13bf70932fd3f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 13 Sep 2015 12:04:55 +0200 Subject: Revert "services: 'mingetty-service' no longer takes monadic values." This reverts commit daa48c31797b27e3a0991d0db7406c951ebc86df. --- doc/guix.texi | 2 +- gnu/services/base.scm | 17 ++++++++++++----- gnu/system/linux.scm | 4 ++-- 3 files changed, 15 insertions(+), 8 deletions(-) (limited to 'gnu/system') diff --git a/doc/guix.texi b/doc/guix.texi index 59d60bc263..9ae91a8d1e 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -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 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.) 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") diff --git a/gnu/system/linux.scm b/gnu/system/linux.scm index ac5005ebd1..7461a4a61f 100644 --- a/gnu/system/linux.scm +++ b/gnu/system/linux.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015 Ludovic Courtès +;;; Copyright © 2013, 2014 Ludovic Courtès ;;; ;;; 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) "Return a standard Unix-style PAM service for NAME. When 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 . (let ((name* name)) (pam-service -- cgit 1.4.1