From: "Jan (janneke) Nieuwenhuizen" <janneke@gnu.org>
To: 42047@debbugs.gnu.org
Subject: bug#42047: [PATCH 2/3] image: hurd: Initialize root partition for the Hurd.
Date: Thu, 25 Jun 2020 22:38:49 +0200 [thread overview]
Message-ID: <20200625203850.25057-2-janneke@gnu.org> (raw)
In-Reply-To: <20200625203850.25057-1-janneke@gnu.org>
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(-)
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 @@
(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 @@
(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 @@
(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
--
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com
next prev parent reply other threads:[~2020-06-25 20:39 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-25 20:34 bug#42047: [PATCH 0/3] Running guix gc on the Hurd Jan (janneke) Nieuwenhuizen
2020-06-25 20:38 ` bug#42047: [PATCH 1/3] image: hurd: Create hurd-compatible ext2 file-system Jan (janneke) Nieuwenhuizen
2020-06-25 20:38 ` Jan (janneke) Nieuwenhuizen [this message]
2020-06-25 20:38 ` bug#42047: [PATCH 3/3] guix: gc: Support for the Hurd Jan (janneke) Nieuwenhuizen
2020-06-25 20:48 ` Ludovic Courtès
2020-06-25 22:25 ` Bengt Richter
2020-06-25 20:44 ` bug#42047: [PATCH 1/3] image: hurd: Create hurd-compatible ext2 file-system Ludovic Courtès
2020-06-25 20:53 ` Jan Nieuwenhuizen
2020-06-26 8:27 ` bug#42047: [PATCH 3/3] guix: gc: Support for the Hurd Jan Nieuwenhuizen
2020-06-27 11:25 ` bug#42047: [PATCH v2] " Jan Nieuwenhuizen
2020-06-28 14:31 ` Ludovic Courtès
2020-06-26 15:46 ` bug#42047: [PATCH 0/3] Running guix gc on " Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200625203850.25057-2-janneke@gnu.org \
--to=janneke@gnu.org \
--cc=42047@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).