aboutsummaryrefslogtreecommitdiff
path: root/gnu/system
diff options
context:
space:
mode:
authorJan (janneke) Nieuwenhuizen <janneke@gnu.org>2020-06-01 09:46:39 +0200
committerJan Nieuwenhuizen <janneke@gnu.org>2020-06-08 14:26:14 +0200
commitb37c544196898cc3dfa3da07ed344fbe11abc120 (patch)
tree78d72f743763b699ed29402aab35699286b81db7 /gnu/system
parent11e4200feeffcf1abdd1559c9fca48373599ab10 (diff)
downloadguix-b37c544196898cc3dfa3da07ed344fbe11abc120.tar
guix-b37c544196898cc3dfa3da07ed344fbe11abc120.tar.gz
hurd-boot: Further cleanup of "rc".
* gnu/packages/hurd.scm (hurd-rc-script): Move implementation to ... * gnu/build/hurd-boot.scm (boot-hurd-system): ...here, new file. * gnu/build/linux-boot.scm (make-hurd-device-nodes): Move there likewise. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
Diffstat (limited to 'gnu/system')
-rw-r--r--gnu/system/image.scm2
-rw-r--r--gnu/system/vm.scm5
2 files changed, 5 insertions, 2 deletions
diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index 15dac8af57..a0e6bf31f1 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -167,6 +167,7 @@
(with-imported-modules `(,@(source-module-closure
'((gnu build vm)
(gnu build image)
+ (gnu build hurd-boot)
(gnu build linux-boot)
(guix store database))
#:select? not-config?)
@@ -174,6 +175,7 @@
#~(begin
(use-modules (gnu build vm)
(gnu build image)
+ (gnu build hurd-boot)
(gnu build linux-boot)
(guix store database)
(guix build utils))
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 038cce19b6..686e56348d 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -344,9 +344,10 @@ system that is passed to 'populate-root-file-system'."
#~(begin
(use-modules (gnu build bootloader)
(gnu build vm)
+ ((gnu build hurd-boot)
+ #:select (make-hurd-device-nodes))
((gnu build linux-boot)
- #:select (make-essential-device-nodes
- make-hurd-device-nodes))
+ #:select (make-essential-device-nodes))
(guix store database)
(guix build utils)
(srfi srfi-26)