1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-28 12:01:49 +02:00

image: Move hurd image definition to a dedicated file.

This moves hurd-disk-image to a dedicated file. It also defines a default
operating-system so that the image can be built standalone.

* gnu/system/images/hurd.scm: New file,
* gnu/local.mk (GNU_SYSTEM_MODULES): add it,
* gnu/system/image.scm (root-offset, root-label): Export it,
(hurd-disk-image): remove it as this is now defined in the new, Hurd dedicated
file above,
(find-image): adapt to avoid loop dependency.
This commit is contained in:
Mathieu Othacehe
2020-06-13 17:33:10 +02:00
committed by Mathieu Othacehe
parent af0307a099
commit b904b59ce5
4 changed files with 86 additions and 17 deletions
+6 -17
View File
@@ -53,10 +53,12 @@
#:use-module (srfi srfi-35)
#:use-module (rnrs bytevectors)
#:use-module (ice-9 match)
#:export (esp-partition
#:export (root-offset
root-label
esp-partition
root-partition
hurd-disk-image
efi-disk-image
iso9660-image
@@ -101,20 +103,6 @@
(list #:make-device-nodes
make-hurd-device-nodes)))))
(define hurd-disk-image
(image
(format 'disk-image)
(target "i586-pc-gnu")
(partitions
(list (partition
(size 'guess)
(offset root-offset)
(label root-label)
(file-system "ext2")
(file-system-options '("-o" "hurd" "-O" "ext_attr"))
(flags '(boot))
(initializer hurd-initialize-root-partition))))))
(define efi-disk-image
(image
(format 'disk-image)
@@ -565,7 +553,8 @@ addition of the <image> record."
(_ (cond
((and target
(hurd-triplet? target))
hurd-disk-image)
(module-ref (resolve-interface '(gnu system images hurd))
'hurd-disk-image))
(else
efi-disk-image)))))