diff options
| author | Jakub Kądziołka <kuba@kadziolka.net> | 2020-06-22 02:56:22 +0200 |
|---|---|---|
| committer | Jakub Kądziołka <kuba@kadziolka.net> | 2020-06-22 02:56:22 +0200 |
| commit | 43bc7855113bd725d464dd9eaa1e54e78edfaab1 (patch) | |
| tree | 2655f85e9946ececdb4fb052c2f3e31375c41e0f /gnu/system | |
| parent | 0c4e39c0b025fb23a2e5df46434fc96112bb6d6c (diff) | |
| parent | f8a28b6c6d4fe7642b7df35e8518e3c0174ede74 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/hurd.scm | 5 | ||||
| -rw-r--r-- | gnu/system/image.scm | 20 | ||||
| -rw-r--r-- | gnu/system/uuid.scm | 2 |
3 files changed, 13 insertions, 14 deletions
diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 2205def577..43d98cc8c2 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -81,7 +81,10 @@ (service guix-service-type (guix-configuration (extra-options '("--disable-chroot" - "--disable-deduplication")))))) + "--disable-deduplication")))) + (service special-files-service-type + `(("/bin/sh" ,(file-append bash "/bin/sh")) + ("/usr/bin/env" ,(file-append coreutils "/bin/env")))))) (define %hurd-default-operating-system (operating-system diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 1bda25fd7f..26ffa028fe 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -524,15 +524,15 @@ it can be used for bootloading." "Return the derivation of IMAGE. It can be a raw disk-image or an ISO9660 image, depending on IMAGE format." (define substitutable? (image-substitutable? image)) + (define target (image-target image)) - (let* ((os (operating-system-for-image image)) - (image* (image-with-os image os)) - (target (image-target image)) - (register-closures? (has-guix-service-type? os)) - (bootcfg (operating-system-bootcfg os)) - (bootloader (bootloader-configuration-bootloader - (operating-system-bootloader os)))) - (with-parameters ((%current-target-system target)) + (with-parameters ((%current-target-system target)) + (let* ((os (operating-system-for-image image)) + (image* (image-with-os image os)) + (register-closures? (has-guix-service-type? os)) + (bootcfg (operating-system-bootcfg os)) + (bootloader (bootloader-configuration-bootloader + (operating-system-bootloader os)))) (case (image-format image) ((disk-image) (system-disk-image image* @@ -573,8 +573,4 @@ addition of the <image> record." (else efi-disk-image))))) -;;; Local Variables: -;;; eval: (put 'maybe-with-target 'scheme-indent-function 1) -;;; End: - ;;; image.scm ends here diff --git a/gnu/system/uuid.scm b/gnu/system/uuid.scm index 225959e2b7..bc3af69610 100644 --- a/gnu/system/uuid.scm +++ b/gnu/system/uuid.scm @@ -298,5 +298,5 @@ corresponding bytevector; otherwise return #f." (bytevector=? (uuid-bytevector a) b)) (((? uuid? a) (? uuid? b)) (bytevector=? (uuid-bytevector a) (uuid-bytevector b))) - ((a b) + (((or (? uuid? a) (? bytevector? a)) (or (? uuid? b) (? bytevector? b))) (uuid=? b a)))) |