[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/07: install: 'populate-root-file-system' can be passed extra directiv
From: |
guix-commits |
Subject: |
02/07: install: 'populate-root-file-system' can be passed extra directives. |
Date: |
Wed, 1 Apr 2020 10:26:37 -0400 (EDT) |
civodul pushed a commit to branch wip-hurd-vm
in repository guix.
commit 218bf04ab0f461ec9c9be0995502e804e64ae3ec
Author: Ludovic Courtès <address@hidden>
AuthorDate: Wed Apr 1 14:59:58 2020 +0200
install: 'populate-root-file-system' can be passed extra directives.
* gnu/build/install.scm (evaluate-populate-directive): Handle 'file'
directives.
(populate-root-file-system): Add #:extras parameter and honor it.
---
gnu/build/install.scm | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/gnu/build/install.scm b/gnu/build/install.scm
index c0d4d44..d46b588 100644
--- a/gnu/build/install.scm
+++ b/gnu/build/install.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès
<address@hidden>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès
<address@hidden>
;;; Copyright © 2016 Chris Marusich <address@hidden>
;;;
;;; This file is part of GNU Guix.
@@ -67,6 +67,13 @@ directory TARGET."
(('directory name uid gid mode)
(loop `(directory ,name ,uid ,gid))
(chmod (string-append target name) mode))
+ (('file name)
+ (call-with-output-file (string-append target name)
+ (const #t)))
+ (('file name (? string? content))
+ (call-with-output-file (string-append target name)
+ (lambda (port)
+ (display content port))))
((new '-> old)
(let try ()
(catch 'system-error
@@ -119,11 +126,14 @@ STORE."
(directory "/home" 0 0)))
-(define (populate-root-file-system system target)
+(define* (populate-root-file-system system target
+ #:key (extras '()))
"Make the essential non-store files and directories on TARGET. This
-includes /etc, /var, /run, /bin/sh, etc., and all the symlinks to SYSTEM."
+includes /etc, /var, /run, /bin/sh, etc., and all the symlinks to SYSTEM.
+EXTRAS is a list of directives appended to the built-in directives to populate
+TARGET."
(for-each (cut evaluate-populate-directive <> target)
- (directives (%store-directory)))
+ (append (directives (%store-directory)) extras))
;; Add system generation 1.
(let ((generation-1 (string-append target
- branch wip-hurd-vm created (now 2181f05), guix-commits, 2020/04/01
- 02/07: install: 'populate-root-file-system' can be passed extra directives.,
guix-commits <=
- 01/07: gnu: gnumach: Fix compilation., guix-commits, 2020/04/01
- 03/07: vm: 'qemu-image' accepts a list of extra populate directives., guix-commits, 2020/04/01
- 04/07: vm: 'qemu-image' can pass options to the 'mkfs' command., guix-commits, 2020/04/01
- 05/07: gnu: gnumach: Enable kernel debugger (kbd)., guix-commits, 2020/04/01
- 06/07: DRAFT: gnu: hurd: Provide our own /libexec/rc script., guix-commits, 2020/04/01
- 07/07: DRAFT: Add (gnu system hurd)., guix-commits, 2020/04/01