janneke pushed a commit to branch wip-hurd-vm in repository guix. commit 83c2b8a34905170c424a02a0a46ee968420a4905 Author: Jan (janneke) Nieuwenhuizen <jann...@gnu.org> AuthorDate: Wed Jun 3 18:42:33 2020 +0200
Revert "image: Support extra-directives, add hurd-directives." The /hurd symlink is no longer necessary, now that /hurd is substituted in the early boot process, and /hurd is created during activation. This reverts commit ee8131993439fb56d8ffb02e47cbbe85134783e7. --- gnu/build/image.scm | 3 +-- gnu/system/image.scm | 9 +-------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/gnu/build/image.scm b/gnu/build/image.scm index 7355c54..fb85bd4 100644 --- a/gnu/build/image.scm +++ b/gnu/build/image.scm @@ -163,7 +163,6 @@ deduplicates files common to CLOSURE and the rest of PREFIX." system-directory (make-device-nodes make-essential-device-nodes) - (extra-directives '()) #:allow-other-keys) "Initialize the given ROOT directory. Use BOOTCFG and BOOTCFG-LOCATION to install the bootloader configuration. @@ -172,7 +171,7 @@ If REGISTER-CLOSURES? is true, register REFERENCES-GRAPHS in the store. If DEDUPLICATE? is true, then also deduplicate files common to CLOSURES and the rest of the store when registering the closures. SYSTEM-DIRECTORY is the name of the directory of the 'system' derivation." - (populate-root-file-system system-directory root #:extras extra-directives) + (populate-root-file-system system-directory root) (populate-store references-graphs root) ;; Populate /dev. diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 2be2ece..a0e6bf3 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -204,7 +204,6 @@ bootcfg bootloader register-closures? - (extra-directives '()) (inputs '())) "Return as a file-like object, the disk-image described by IMAGE. Said image can be copied on a USB stick as is. BOOTLOADER is the bootloader that @@ -270,7 +269,6 @@ used in the image." #:deduplicate? #f #:system-directory #$os #:grub-efi #+grub-efi - #:extra-directives '#$extra-directives #:bootloader-package #+(bootloader-package bootloader) #:bootloader-installer @@ -530,18 +528,13 @@ image, depending on IMAGE format." (register-closures? (has-guix-service-type? os)) (bootcfg (operating-system-bootcfg os)) (bootloader (bootloader-configuration-bootloader - (operating-system-bootloader os))) - (hurd (operating-system-hurd os)) - (hurd-directives (if hurd - `(("/hurd" -> ,(file-append hurd "/hurd"))) - '()))) + (operating-system-bootloader os)))) (case (image-format image) ((disk-image) (system-disk-image image* #:bootcfg bootcfg #:bootloader bootloader #:register-closures? register-closures? - #:extra-directives hurd-directives #:inputs `(("system" ,os) ("bootcfg" ,bootcfg)))) ((iso9660)