summary refs log tree commit diff
path: root/gnu/system/install.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-09-07 22:44:26 +0200
committerLudovic Courtès <ludo@gnu.org>2015-10-10 22:46:14 +0200
commitce8a6dfc43265787c23fb93d3877fbcacb0451e4 (patch)
tree97371c59b467d361d5c2b3b82864c9e8300f4d31 /gnu/system/install.scm
parentb751cde36b508690d5f893360f964d3098549131 (diff)
downloadguix-ce8a6dfc43265787c23fb93d3877fbcacb0451e4.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.
* gnu/system/install.scm (installation-services): Adjust accordingly.
  (log-to-info): Use 'program-file' instead of 'gexp->script'.
Diffstat (limited to 'gnu/system/install.scm')
-rw-r--r--gnu/system/install.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index c161526d77..dc5a47a293 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -102,7 +102,7 @@ under /root/.guix-profile where GUIX is installed."
 (define (log-to-info)
   "Return a script that spawns the Info reader on the right section of the
 manual."
-  (gexp->script "log-to-info"
+  (program-file "log-to-info"
                 #~(begin
                     ;; 'gunzip' is needed to decompress the doc.
                     (setenv "PATH" (string-append #$gzip "/bin"))
@@ -234,7 +234,7 @@ configuration template file in the installation system."
 
 (define (installation-services)
   "Return the list services for the installation image."
-  (let ((motd (text-file "motd" "
+  (let ((motd (plain-file "motd" "
 Welcome to the installation of the Guix System Distribution!
 
 There is NO WARRANTY, to the extent permitted by law.  In particular, you may