From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:34843) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJgEG-00036z-VL for guix-patches@gnu.org; Thu, 25 Apr 2019 11:24:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJgEF-0003mp-4v for guix-patches@gnu.org; Thu, 25 Apr 2019 11:24:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45592) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hJgEE-0003m9-49 for guix-patches@gnu.org; Thu, 25 Apr 2019 11:24:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hJgEE-00068l-00 for guix-patches@gnu.org; Thu, 25 Apr 2019 11:24:02 -0400 Subject: [bug#35428] [WIP] vm: Pass xorriso customizer. Resent-Message-ID: Received: from eggs.gnu.org ([209.51.188.92]:34626) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJgDR-0002DA-GJ for guix-patches@gnu.org; Thu, 25 Apr 2019 11:23:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJgDQ-000370-Hr for guix-patches@gnu.org; Thu, 25 Apr 2019 11:23:13 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:45956) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hJgDQ-00031o-9P for guix-patches@gnu.org; Thu, 25 Apr 2019 11:23:12 -0400 From: Danny Milosavljevic Date: Thu, 25 Apr 2019 17:23:06 +0200 Message-Id: <20190425152306.22872-1-dannym@scratchpost.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 35428@debbugs.gnu.org * 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 --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=3D" config-file)))) =20 -(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-FI= LE as @@ -430,6 +430,9 @@ GRUB configuration and OS-DRV as the stuff in it." (define grub-mkrescue (string-append grub "/bin/grub-mkrescue")) =20 + (define grub-mkrescue-sed.sh + (string-append xorriso "/bin/grub-mkrescue-sed.sh")) + (define target-store (string-append "/tmp/root" (%store-directory))) =20 @@ -484,7 +487,9 @@ GRUB configuration and OS-DRV as the stuff in it." =20 (let ((pipe (apply open-pipe* OPEN_WRITE - grub-mkrescue "-o" target + grub-mkrescue + (string-append "--xorriso=3D" grub-mkrescue-sed.sh) + "-o" target (string-append "boot/grub/grub.cfg=3D" config-file) "etc=3D/tmp/root/etc" "var=3D/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))) =20 (set-path-environment-variable "PATH" '("bin" "sbin") input= s) - (make-iso9660-image #$(bootloader-package bootloader) + (make-iso9660-image #$xorriso + #$(bootloader-package bootloader) #$bootcfg-drv #$os "/xchg/guixsd.iso"