diff mbox series

[bug#35428,WIP] vm: Pass xorriso customizer.

Message ID 20190425152306.22872-1-dannym@scratchpost.org
State Accepted
Headers show
Series [bug#35428,WIP] vm: Pass xorriso customizer. | expand

Checks

Context Check Description
cbaines/applying patch success Successfully applied

Commit Message

Danny Milosavljevic April 25, 2019, 3:23 p.m. UTC 
* gnu/build/vm.scm (make-iso9660-image): Accept XORRISO.
* gnu/system/vm.scm (iso9660-image): Pass XORRISO.
---
 gnu/build/vm.scm  | 9 +++++++--
 gnu/system/vm.scm | 3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index 372cf63c68..52dd44ac21 100644
--- a/gnu/build/vm.scm
+++ b/gnu/build/vm.scm
@@ -422,7 +422,7 @@  SYSTEM-DIRECTORY is the name of the directory of the 'system' derivation."
             ;; Graft the configuration file onto the image.
             (string-append "boot/grub/grub.cfg=" config-file))))
 
-(define* (make-iso9660-image grub config-file os-drv target
+(define* (make-iso9660-image xorriso grub config-file os-drv target
                              #:key (volume-id "Guix_image") (volume-uuid #f)
                              register-closures? (closures '()))
   "Given a GRUB package, creates an iso image as TARGET, using CONFIG-FILE as
@@ -430,6 +430,9 @@  GRUB configuration and OS-DRV as the stuff in it."
   (define grub-mkrescue
     (string-append grub "/bin/grub-mkrescue"))
 
+  (define grub-mkrescue-sed.sh
+    (string-append xorriso "/bin/grub-mkrescue-sed.sh"))
+
   (define target-store
     (string-append "/tmp/root" (%store-directory)))
 
@@ -484,7 +487,9 @@  GRUB configuration and OS-DRV as the stuff in it."
 
   (let ((pipe
          (apply open-pipe* OPEN_WRITE
-                grub-mkrescue "-o" target
+                grub-mkrescue
+                (string-append "--xorriso=" grub-mkrescue-sed.sh)
+                "-o" target
                 (string-append "boot/grub/grub.cfg=" config-file)
                 "etc=/tmp/root/etc"
                 "var=/tmp/root/var"
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 92b03b01ad..8a1272aff9 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -301,7 +301,8 @@  INPUTS is a list of inputs (as for packages)."
                           inputs)))
 
              (set-path-environment-variable "PATH" '("bin" "sbin") inputs)
-             (make-iso9660-image #$(bootloader-package bootloader)
+             (make-iso9660-image #$xorriso
+                                 #$(bootloader-package bootloader)
                                  #$bootcfg-drv
                                  #$os
                                  "/xchg/guixsd.iso"