From 2463a78d17673581978debff6c6c9fce7966980a Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Thu, 25 Jun 2020 21:47:51 +0200 Subject: image: hurd: Initialize root partition for the Hurd. This is a follow-up to commit b904b59ce592c89dfb4675a8c06757afed6738a0. * gnu/system/image.scm (hurd-initialize-root-partition): Move to ... * gnu/system/images/hurd.scm (hurd-initialize-root-partition): ... here. (hurd-disk-image): Use it. --- gnu/system/image.scm | 7 ------- gnu/system/images/hurd.scm | 9 ++++++++- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/system') diff --git a/gnu/system/image.scm b/gnu/system/image.scm index bb73aea65a..a4cc2d1ef9 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -96,13 +96,6 @@ (define root-partition (flags '(boot)) (initializer (gexp initialize-root-partition)))) -(define hurd-initialize-root-partition - #~(lambda* (#:rest args) - (apply initialize-root-partition - (append args - (list #:make-device-nodes - make-hurd-device-nodes))))) - (define efi-disk-image (image (format 'disk-image) diff --git a/gnu/system/images/hurd.scm b/gnu/system/images/hurd.scm index e5e120d49c..31942e7386 100644 --- a/gnu/system/images/hurd.scm +++ b/gnu/system/images/hurd.scm @@ -57,6 +57,13 @@ (define hurd-barebones-os (password-authentication? #t))) %base-services/hurd)))) +(define hurd-initialize-root-partition + #~(lambda* (#:rest args) + (apply initialize-root-partition + (append args + (list #:make-device-nodes + make-hurd-device-nodes))))) + (define hurd-disk-image (image (format 'disk-image) @@ -69,7 +76,7 @@ (define hurd-disk-image (file-system "ext2") (file-system-options '("-o" "hurd" "-O" "ext_attr")) (flags '(boot)) - (initializer (gexp initialize-root-partition))))))) + (initializer hurd-initialize-root-partition)))))) (define hurd-barebones-disk-image (image -- cgit v1.2.3