From unknown Thu Jul 31 07:48:29 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#26815 <26815@debbugs.gnu.org> To: bug#26815 <26815@debbugs.gnu.org> Subject: Status: [PATCH 0/3] Hybrid UEFI disk image Reply-To: bug#26815 <26815@debbugs.gnu.org> Date: Thu, 31 Jul 2025 14:48:29 +0000 retitle 26815 [PATCH 0/3] Hybrid UEFI disk image reassign 26815 guix-patches submitter 26815 Marius Bakke severity 26815 important tag 26815 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sun May 07 10:35:27 2017 Received: (at submit) by debbugs.gnu.org; 7 May 2017 14:35:28 +0000 Received: from localhost ([127.0.0.1]:60413 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7NHS-0005QI-JI for submit@debbugs.gnu.org; Sun, 07 May 2017 10:35:27 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33737) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7NHR-0005Q6-5r for submit@debbugs.gnu.org; Sun, 07 May 2017 10:35:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7NHL-00017H-0Z for submit@debbugs.gnu.org; Sun, 07 May 2017 10:35:19 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_40,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:47472) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d7NHK-00017D-TA for submit@debbugs.gnu.org; Sun, 07 May 2017 10:35:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52939) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7NHJ-0004qd-OV for guix-patches@gnu.org; Sun, 07 May 2017 10:35:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7NHE-00016r-Sh for guix-patches@gnu.org; Sun, 07 May 2017 10:35:17 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:39939) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d7NHE-00016n-NE for guix-patches@gnu.org; Sun, 07 May 2017 10:35:12 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id ACDD420571; Sun, 7 May 2017 10:35:08 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Sun, 07 May 2017 10:35:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:message-id:subject:to:x-me-sender:x-me-sender :x-sasl-enc:x-sasl-enc; s=fm1; bh=Go8YWyb1XRpx03Zr2WaNEsQ7WaOcPF f5+DxwTur39j4=; b=HCEzg+/IMfCbEmzVcpGsOTnoC4czq4wFCtnhnEd6ots6uT RAMFCBryU6I/MYrKVlwmX2dXtwHr0cquAF6rjBVdHnWDp022fNckRUsN6k2ioKpb Vl9K0vFUpYfxBqTn3d7ybW5jbUSifiWSPBZ70k7t8zh5OMziIvYCFR20nvHt4+b/ W4b7zDLXpE1wFVhW5qKR15+MCeWNgoiPea6o7631QCu3je+Uj/hlCzbBZ3/KR35p qF4HbhY5bnTK7fayheNmQLdmnCfq1VsOnLONH0PNXfusgllgP/CqvduiFLavO+gr iOIWqVdN+7HdixrEm4ZZgFtLGT0MGBKVoKwo+CMg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=Go8YWy b1XRpx03Zr2WaNEsQ7WaOcPFf5+DxwTur39j4=; b=PWcU87uV2scdom16uZ79DG c/aN/sgcCOihMWwcW10S0+V3GfwJxkZXTU36rJ5U1jZuG/mN89eEY9D0s4SQltG8 9DnUm7+ONXnI/KHOzQ6zWLUejMEDvydwazSJORTa8hhzoOLCjObefO08Rn6aUt/Y 5xpCrjBhls8InU+mvi4XZefYVXJexg5unbcIZrO+NRseMUQZUxXxaj3pE4MTHl2v jzGFemgk7aPr12giYbwqK6JtR2AVkylaJZppNffTu/9OUgj4A/2hflqetZyksJGp t3noG6r4LA4W1F6CfWzypHiNXCob25UVVVMM4cJnjIMAaIzd0/r2jQ5f5vUGb8/w == X-ME-Sender: X-Sasl-enc: xKw926B4e2rMO++Q+cU0pk5hQLbOznryWQ62iTEPTzSc 1494167708 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 42A217E78C; Sun, 7 May 2017 10:35:08 -0400 (EDT) From: Marius Bakke To: guix-patches@gnu.org Subject: [PATCH 0/3] Hybrid UEFI disk image Date: Sun, 7 May 2017 16:35:05 +0200 Message-Id: <20170507143505.20724-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.12.2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.4 (----) X-Debbugs-Envelope-To: submit Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.4 (----) This ended up a lot simpler than anticipated. These patches are on top of , but can be ported to master since it ultimately didn't use any of the new tricks. Test with: $ cp $(./pre-inst-env guix system disk-image --image-size=1G \ gnu/system/install.scm) install.img $ chmod 644 install.img $ qemu-system-x86_64 -enable-kvm -m 512M -serial stdio \ -bios $(guix build ovmf)/share/firmware/ovmf_x64.bin \ -drive file=install.img,if=virtio One caveat is that it probably only works on most(?) 64-bit systems. Please test it on real hardware, especially older EFI systems. Not sure what to do about 32-bit yet. Marius Bakke (3): vm: Add support for arbitrary partition flags. vm: Support creating FAT partitions. vm: Support EFI boot in base image. gnu/build/vm.scm | 98 +++++++++++++++++++++++++++++++++++++++------ gnu/system/linux-initrd.scm | 4 +- gnu/system/vm.scm | 16 ++++++-- 3 files changed, 98 insertions(+), 20 deletions(-) -- 2.12.2 From debbugs-submit-bounces@debbugs.gnu.org Sun May 07 10:36:53 2017 Received: (at 26815) by debbugs.gnu.org; 7 May 2017 14:36:53 +0000 Received: from localhost ([127.0.0.1]:60420 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7NIr-0005Sc-2t for submit@debbugs.gnu.org; Sun, 07 May 2017 10:36:53 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:49645) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7NIp-0005SU-7y for 26815@debbugs.gnu.org; Sun, 07 May 2017 10:36:51 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id B7E322066A; Sun, 7 May 2017 10:36:50 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Sun, 07 May 2017 10:36:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=TW5sFVbShcDxRZhxx+PiWde6g9xN88klpiOJPHSwP 00=; b=bxhnsjXv+9W39R9FenBtp5yfF8GtbgSkisXi1SUXa/4yqnasO8Qm6T6/b JcIr2Xph/6vJ0wtaKjwf+NZFUz555hsGE0fPioQC9Fw61uI1sPnROinrJ9R+bOwQ vPKpI53q8DiqF21g24E80A5dzojrmXQdXUQ4P6eNqJxsfGX2bqOs2f9+tipm4hbE L7ZFpsybQLcw/nNo776zm3AS866FgrbATb1oYX+i21WdtUbq/HoDQDK8S/DiBvmm iDK2daijFtFEncLifJ0XfIMR9tQlY1IPe3SOdeAQGGh88vA9Ew/gwMP6kHksE8OT eBu8mpN2vdHQ+qFyW21v8+QblKW4g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=TW5sFVbShcDxRZhxx+ PiWde6g9xN88klpiOJPHSwP00=; b=oJO+/FLY4tP322hzhutlaKaBxQJbDGeAu7 fWya1wxX4HR8zhyDk3F/YzT2MuDg/hL2KYJ8Ek+/XA2NkhkkDLRtGBzLYgmocvFa wgmFE2q0N7LLNNAT3CoAtvYVUzh8Wexu+i43HcBeKC0SY807h2ZyLiWQvA7MuW98 cuoZtRqwq9+SwGpr5s8mhhGRhK7THEI+D6GxBK/ZeTJXMnxNwNgn6/DxWf2RBFzm NFscaB5fp3WzqQym57J7HOXInSGCRXUPlVcd3p62A/hkn4E8+zXz/6t2hxMAOGDn b3CsFqEhzs0mhDNmbScifA2NVzezb46VA5WuwcTSkw3rxw4o96lw== X-ME-Sender: X-Sasl-enc: hEPO3qyqzvfB6TpU39DQKdUm4lBhe0NbXE97wXM7K/Sx 1494167810 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 469EB7E78C; Sun, 7 May 2017 10:36:50 -0400 (EDT) From: Marius Bakke To: 26815@debbugs.gnu.org Subject: [PATCH 1/3] vm: Add support for arbitrary partition flags. Date: Sun, 7 May 2017 16:36:45 +0200 Message-Id: <20170507143647.21036-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.12.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/build/vm.scm (): Change BOOTABLE? to FLAGS. (initialize-partition-table): Pass each flag to parted. (initialize-hard-disk): Search for root partition by "boot" flag. * gnu/system/vm.scm (qemu-image): Adjust partitions accordingly. --- gnu/build/vm.scm | 18 +++++++++++++----- gnu/system/vm.scm | 2 +- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 440596a40..3286ffb02 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,7 +42,7 @@ partition-size partition-file-system partition-label - partition-bootable? + partition-flags partition-initializer root-partition-initializer @@ -141,7 +142,7 @@ the #:references-graphs parameter of 'derivation'." (size partition-size) (file-system partition-file-system (default "ext4")) (label partition-label (default #f)) - (bootable? partition-bootable? (default #f)) + (flags partition-flags (default '())) (initializer partition-initializer (default (const #t)))) (define (fold2 proc seed1 seed2 lst) ;TODO: factorize @@ -168,9 +169,11 @@ actual /dev name based on DEVICE." (cons* "mkpart" "primary" "ext2" (format #f "~aB" offset) (format #f "~aB" (+ offset (partition-size part))) - (if (partition-bootable? part) - `("set" ,(number->string index) "boot" "on") - '()))) + (apply append (map (lambda (flag) + (cons* "set" (number->string index) + (symbol->string flag) + "on" '())) + (partition-flags part))))) (define (options partitions offset) (let loop ((partitions partitions) @@ -303,6 +306,11 @@ in PARTITIONS, and using BOOTCFG as its bootloader configuration file. Each partition is initialized by calling its 'initializer' procedure, passing it a directory name where it is mounted." + + (define (partition-bootable? partitions) + "Return the first partition found with the boot flag set." + (member 'boot (partition-flags partitions))) + (let* ((partitions (initialize-partition-table device partitions)) (root (find partition-bootable? partitions)) (target "/fs")) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index cc13abe2a..42c7690b1 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -230,7 +230,7 @@ the image." (* 10 (expt 2 20)))) (label #$file-system-label) (file-system #$file-system-type) - (bootable? #t) + (flags '(boot)) (initializer initialize))))) (initialize-hard-disk "/dev/vda" #:partitions partitions -- 2.12.2 From debbugs-submit-bounces@debbugs.gnu.org Sun May 07 10:36:55 2017 Received: (at 26815) by debbugs.gnu.org; 7 May 2017 14:36:55 +0000 Received: from localhost ([127.0.0.1]:60425 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7NIt-0005Sr-D0 for submit@debbugs.gnu.org; Sun, 07 May 2017 10:36:55 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:48901) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7NIr-0005Sk-L1 for 26815@debbugs.gnu.org; Sun, 07 May 2017 10:36:54 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 8910A20832; Sun, 7 May 2017 10:36:53 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Sun, 07 May 2017 10:36:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=NQRlMs o4WsK6ujOAEvrRpHVvoB1sMH/1sp12aIiE61I=; b=lYDRA76WJdjadgfTGrQ7+p SWoesWTMxOlOAdWiWC1GSBJgpcOqiWG0Ye3I0rb4D1De8FmikYJfpTnTrtZ0UsLn QjF6YjfZfinJUmiWN08VVwQRnWoTXZE/e8pgkeGm5mUVPaf3hdK/sNXozk9CELCR DSmvK+vjSFEYXi1AJQQBU/PPSFdfPjPXqdS7Mdo9dN/yrtTuX/J1z4AMm1o4FMnV 2U2vSx12k3CvE7j61WBBf4qtGjhDQXTYxYZjAHxhQOtHbqdE9TkACGCv51wh+i/0 94GrmLzvfD/BrFo2MdMxeS7z4e4VkFSQBTp6Z94qX4vq4j1lovSk3I05L9nakV5g == DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=NQRlMso4WsK6ujOAEvrRpHVvoB1sMH/1sp12aIiE6 1I=; b=et/V0S083PIqoQHfeFbiteJFDFAXTxTmdooR1K6Ly68VWnGQwPrDoUzfM GZqlvGmq8Z6nRHAqXGssALa9hHzDSRrVn6KyxFijXB6YXu5ZQVWivQBicJKSw61U oW83vODNuyMS0sL9n2s5JC38xW2SP3AFHMO23RfEtatA0yDqZCxWeB+bovb24NF3 VMYPCf891pYgSqcvM7tidmBkrpzQcEFBdW/KzvrLkJQuCPjCTd7oThndejPxZb2t Ka8mHZ14LaFuVlVlTivoV8Ivw3iwQV2xDOs9iTtwCGTXbM+uoRCYQflO5XFLyO8c sUaBFn6mAm7A71oWXiUAZxNTA4/mw== X-ME-Sender: X-Sasl-enc: usuZYj/XP67m9RXsP03vHMmQlZaP5CnRjR83AtI820zQ 1494167813 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 270677E6B1; Sun, 7 May 2017 10:36:53 -0400 (EDT) From: Marius Bakke To: 26815@debbugs.gnu.org Subject: [PATCH 2/3] vm: Support creating FAT partitions. Date: Sun, 7 May 2017 16:36:46 +0200 Message-Id: <20170507143647.21036-2-mbakke@fastmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170507143647.21036-1-mbakke@fastmail.com> References: <20170507143647.21036-1-mbakke@fastmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/build/vm.scm (create-ext-file-system, create-fat-file-system): New procedures. (format-partition): Use procedures. Error for unknown file systems. * gnu/system/vm.scm (qemu-image): Add DOSFSTOOLS to the closure. * gnu/system/linux-initrd.scm (base-initrd): Add nls_is8859-1.ko regardless of whether a FAT filesystem is present. --- gnu/build/vm.scm | 43 ++++++++++++++++++++++++++++++++++++------- gnu/system/linux-initrd.scm | 4 +--- gnu/system/vm.scm | 2 +- 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 3286ffb02..ad39e29ce 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -214,17 +214,46 @@ actual /dev name based on DEVICE." (define MS_BIND 4096) ; again! +(define* (create-ext-file-system partition type + #:key label) + "Create an ext-family filesystem of TYPE on PARTITION. If LABEL is true, +use that as the volume name." + (format #t "creating ~a partition...\n" type) + (apply system* (string-append "mkfs." type) + "-F" partition + (if label + `("-L" ,label) + '()))) + +(define* (create-fat32-file-system partition + #:key label) + "Create a FAT32 filesystem on PARTITION, which must be at least 32 MiB long. +If LABEL is true, use that as volume name." + (format #t "Creating FAT32 partition...\n") + ;; Without the -F parameter, mkfs.fat will automatically determine + ;; the number of file allocation tables based on partition size. + ;; Ensure a FAT32 partition for compatibility with e.g. UEFI. + (apply system* "mkfs.fat" "-F32" partition + (if label + `("-n" ,label) + '()))) + (define* (format-partition partition type #:key label) "Create a file system TYPE on PARTITION. If LABEL is true, use that as the volume name." - (format #t "creating ~a partition...\n" type) - (unless (zero? (apply system* (string-append "mkfs." type) - "-F" partition - (if label - `("-L" ,label) - '()))) - (error "failed to create partition"))) + (define format-procedure + (cond + ((string-prefix? "ext" type) + (create-ext-file-system partition type #:label label)) + ((string-suffix? "fat" type) + (create-fat32-file-system partition #:label label)) + (else #f))) + (if format-procedure + (match (status:exit-val format-procedure) + (0 #t) + (_ (error "Formatting partition failed."))) + (error "Unsupported file system."))) (define (initialize-partition partition) "Format PARTITION, a object with a non-#f 'device' field, mount diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index dfe198e43..3a5e76034 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -268,6 +268,7 @@ loaded at boot time in the order in which they appear." "usbhid" "hid-generic" "hid-apple" ;keyboards during early boot "dm-crypt" "xts" "serpent_generic" "wp512" ;for encrypted root partitions "nvme" ;for new SSD NVMe devices + "nls_iso8859-1" ;for `mkfs.fat`, et.al ,@(if (string-match "^(x86_64|i[3-6]86)-" (%current-system)) '("pata_acpi" "pata_atiixp" ;for ATA controllers "isci") ;for SAS controllers like Intel C602 @@ -281,9 +282,6 @@ loaded at boot time in the order in which they appear." ,@(if (find (file-system-type-predicate "9p") file-systems) virtio-9p-modules '()) - ,@(if (find (file-system-type-predicate "vfat") file-systems) - '("nls_iso8859-1") - '()) ,@(if (find (file-system-type-predicate "btrfs") file-systems) '("btrfs") '()) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 42c7690b1..099e3fac3 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -202,7 +202,7 @@ the image." (guix build utils)) (let ((inputs - '#$(append (list qemu parted e2fsprogs) + '#$(append (list qemu parted e2fsprogs dosfstools) (map canonical-package (list sed grep coreutils findutils gawk)) (if register-closures? (list guix) '()))) -- 2.12.2 From debbugs-submit-bounces@debbugs.gnu.org Sun May 07 10:36:58 2017 Received: (at 26815) by debbugs.gnu.org; 7 May 2017 14:36:58 +0000 Received: from localhost ([127.0.0.1]:60430 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7NIv-0005T7-N3 for submit@debbugs.gnu.org; Sun, 07 May 2017 10:36:58 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:50501) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7NIu-0005Sz-DV for 26815@debbugs.gnu.org; Sun, 07 May 2017 10:36:56 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 517392066A; Sun, 7 May 2017 10:36:56 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Sun, 07 May 2017 10:36:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=VJIHmdQ3pOFT0l2aTm fqpANEKnVgEAyYvxSDJufLXNw=; b=Ucx5sF48g4stCB5iGf5lMUwkd0AY5Hib1z qzSh+mn/C0MWUSymc1m6aHS34ucHnlhE+9R0N+FqnX2vSPnVmcNMoc4osBq/kWqG MQVxn67UfLdOxM2wXlUMjbRSoJfAQy8qT89P3h5Xe9bS4OjyaAFCDZq2EdcIKmIy txF/y7eX9+5vQvTNUUHDA5pYD+M+DajD6ZFHdJIzJ59oa1ih/cMHQA0xCWtKBl2V v1ThUd7gmuoIfq4MyJMIV/agGFkMlFmlag99P4PpaNdP6prJ46ycHx+KkSxfx1Oi mCmbcgcwu638FTpRKLwbWyKt6U6wX2GJvDYRaTNsDlydlsH50Ixw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s= fm1; bh=VJIHmdQ3pOFT0l2aTmfqpANEKnVgEAyYvxSDJufLXNw=; b=lZktcRGW O3x8K56fMEHAtdGWgj9fcBjWNPM7P/YnE2pKIiGI/PIMXyu76fHqjD3DqcMlhj0/ akhM86D+QvshWMyGRpWYFuVICGLrxxKhs5PYtEGSRqTFkAkBweX4o1RHq7H2HYe5 uSK2gvWSswO0etcieooVhZOoTOPuuodpyOnng7xTtkCe//oEJA8Ajj5NzYH8kAN7 FWvKaOXbUd1n/MSEpo+bBqoBL9M3PoHfjl6gF200iG1vy0Xw8/rrydWgi2MZlf3a 2yVE8f6jHyQ7skZNsNQ96z00zW3jrayRcbt8ug3SYd/4fTAu1P7osVkiYE0oMcK0 1FxwmruESLfGTA== X-ME-Sender: X-Sasl-enc: sDQQp5eYurxWZegUTAv/htfu4eJHtklmaQdkTlCltFmY 1494167815 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id DC11B7E8D4; Sun, 7 May 2017 10:36:55 -0400 (EDT) From: Marius Bakke To: 26815@debbugs.gnu.org Subject: [PATCH 3/3] vm: Support EFI boot in base image. Date: Sun, 7 May 2017 16:36:47 +0200 Message-Id: <20170507143647.21036-3-mbakke@fastmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170507143647.21036-1-mbakke@fastmail.com> References: <20170507143647.21036-1-mbakke@fastmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/system/vm.scm (qemu-image): Add GRUB-EFI to inputs. Append 40MB EFI System Partition. * gnu/build/vm.scm (initialize-hard-disk): Generate grub EFI blob when ESP is present. --- gnu/build/vm.scm | 37 ++++++++++++++++++++++++++++++++++++- gnu/system/vm.scm | 14 +++++++++++--- 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index ad39e29ce..a1f419776 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -27,6 +27,7 @@ #:use-module (gnu build linux-boot) #:use-module (gnu build install) #:use-module (guix records) + #:use-module (ice-9 format) #:use-module (ice-9 match) #:use-module (ice-9 regex) #:use-module (srfi srfi-1) @@ -340,9 +341,16 @@ passing it a directory name where it is mounted." "Return the first partition found with the boot flag set." (member 'boot (partition-flags partitions))) + (define (esp-partition? partitions) + "Return the first EFI System Partition." + (member 'esp (partition-flags partitions))) + (let* ((partitions (initialize-partition-table device partitions)) (root (find partition-bootable? partitions)) - (target "/fs")) + (esp (find esp-partition? partitions)) + (target "/fs") + ;; Grub expects EFI System Partitions to be mounted here. + (efi-directory (string-append target "/boot/efi"))) (unless root (error "no bootable partition specified" partitions)) @@ -352,6 +360,33 @@ passing it a directory name where it is mounted." (mkdir-p target) (mount (partition-device root) target (partition-file-system root)) (install-boot-config bootcfg bootcfg-location target) + + ;; If we have an ESP partition, generate a self-contained grub EFI + ;; image and write it to a location known by most firmwares. + (when esp + (display "mounting EFI system partition...\n") + (mkdir-p efi-directory) + (mount (partition-device esp) efi-directory + (partition-file-system esp)) + (mkdir-p (string-append efi-directory "/EFI/BOOT")) + + ;; Grub needs a tmpdir to prepare the image. + (setenv "TMPDIR" (string-append target "/tmp")) + ;; It also requires a tiny configuration file telling the + ;; memdisk where to find the real thing. TODO: Delete it. + (with-output-to-file (string-append target "/tmp/grubdisk.cfg") + (lambda _ + (format #t + "insmod part_msdos~@ + search --set=root --label gnu-disk-image~@ + configfile /boot/grub/grub.cfg~%"))) + (system* "grub-mkstandalone" "-O" "x86_64-efi" "-o" + (string-append efi-directory "/EFI/BOOT/BOOTX64.EFI") + ;; Embed the contents of grubdisk.cfg. + (string-append "boot/grub/grub.cfg=" target + "/tmp/grubdisk.cfg")) + (umount efi-directory)) + (when bootloader-installer (bootloader-installer bootloader device target)) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 099e3fac3..04ccc3650 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -202,7 +203,7 @@ the image." (guix build utils)) (let ((inputs - '#$(append (list qemu parted e2fsprogs dosfstools) + '#$(append (list qemu parted e2fsprogs dosfstools grub-efi) (map canonical-package (list sed grep coreutils findutils gawk)) (if register-closures? (list guix) '()))) @@ -227,11 +228,18 @@ the image." #:system-directory #$os.drv)) (partitions (list (partition (size #$(- disk-image-size - (* 10 (expt 2 20)))) + (* 50 (expt 2 20)))) (label #$file-system-label) (file-system #$file-system-type) (flags '(boot)) - (initializer initialize))))) + (initializer initialize)) + (partition + ;; Append a small FAT32 partition for + ;; use with UEFI bootloaders. + (size (* 40 (expt 2 20))) + (label "gnu-esp") + (file-system "vfat") + (flags '(esp)))))) (initialize-hard-disk "/dev/vda" #:partitions partitions #:bootloader -- 2.12.2 From debbugs-submit-bounces@debbugs.gnu.org Sun May 07 11:02:41 2017 Received: (at 26815) by debbugs.gnu.org; 7 May 2017 15:02:41 +0000 Received: from localhost ([127.0.0.1]:60442 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7Nhp-00064I-1h for submit@debbugs.gnu.org; Sun, 07 May 2017 11:02:41 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:58517) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7Nhn-00064B-Ky for 26815@debbugs.gnu.org; Sun, 07 May 2017 11:02:39 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 8ADBA209ED for <26815@debbugs.gnu.org>; Sun, 7 May 2017 11:02:39 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Sun, 07 May 2017 11:02:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=a2mrzK/RpKWGMCJsUAizSBFtdUx0R6SyPr1VkCkBL Cw=; b=GBptNSenak8KVRlok/jaxtW64QVCWgyngAHNSScrG5lzKZXNiKmdhpot/ 2RpKgh6LgWmCQR5lesZttKhLjPVcxlTJwOFk0ivPG6f+ohn2k0VuEjBSSs+H/n26 ItfuQ+UqYTqEi+qSEBI81uIggeFRvnvjucAdz7/pnFR6q27PP+Wg8CTayffRvw9R fm/qY8YUm1k+Y96P09FO/N+Db2D2p8iyVq48/NhqU3jWdCvY2ax8XeE3rtcrSnyn F7Kg4akSWQxJhZSiZg3Uee00CANvIlHgRLVf1HP7hGPkEVhgZH7sD5TxU66PhzEP mzda4mIjtIwXV0W7EXwJYggSCWDIw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=a2mrzK/RpKWGMCJsUA izSBFtdUx0R6SyPr1VkCkBLCw=; b=eul/0bKWQOBoTNnqA8Y5F7V3nnq2Y3p0d+ 7HVdTgo31C894hN5qUAmIneORFq33obdtGrcCaMh7K76P7y1MTeob3NkgepzO3B3 lOXlgA0ywmkO4V4QdSSo3RXlqVwcNfQJnf0+XPJbVTRSwSEH2L6qHwcCna6ES7+S oY3/nEGZEmF+ooLUQpP/JBzC5SnBVyIc5QBYv3ztPzBEmuB4z02tfMyIM+Lp8v/i mLO2kwT1zFyL+Itni6bdItdyjY3+3s1H7JNLs6v9JBu8ObQmGN3ZX5DAs0wXwIVa GMpAaZQqNKetvASoNXRjpvKTJQkdRNFY1sLhziUPueDTpmKaQSJw== X-ME-Sender: X-Sasl-enc: LJDptmMMyHlltmLN4Mb+oXXDiCt/aP5tYcfGs3SDm+uv 1494169359 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 21A9C248DF for <26815@debbugs.gnu.org>; Sun, 7 May 2017 11:02:39 -0400 (EDT) From: Marius Bakke To: 26815@debbugs.gnu.org Subject: Re: [PATCH 0/3] Hybrid UEFI disk image In-Reply-To: <20170507143505.20724-1-mbakke@fastmail.com> References: <20170507143505.20724-1-mbakke@fastmail.com> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Sun, 07 May 2017 17:02:37 +0200 Message-ID: <87a86ozp4i.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Marius Bakke writes: > This ended up a lot simpler than anticipated. > > These patches are on top of , but can be > ported to master since it ultimately didn't use any of the new tricks. Never mind, grub-install picks up grub-efi when it should use normal grub with these patches on current master, so #26339 is required. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkPNw0ACgkQoqBt8qM6 VPraGQgAoJiJbL15mzqC/7T6heaGVV59dK4kixWGSq7RucPTSSZ9jlKVcoL/bvz2 WjjsqJrSvF24mpvXzXFkUc8kagY+pfNzLrvHL+Iav00fdN+8mF2BoaC21astOchq MCNeoPUCauye9Jg4JEHmJEWqWu4LExVjdJ3dUgZNs+fwHNicLV/jGdY6yjQbFIQn PZoRjl0dQcELqP3w2bfHcgwLhqQwZN2BsyqEkz8/uPif8Gjz0dbhXpxZQWWlK2CT zYCeKt9UeMUcMi41wKv0aqzeQtJysJ0SUek/iGxi9EVyWJGZ7T3JRI/LG9u/P7dN E5alYx4TtrmPl0WmqTvugU/EKDFFew== =VI+C -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun May 07 11:03:45 2017 Received: (at control) by debbugs.gnu.org; 7 May 2017 15:03:45 +0000 Received: from localhost ([127.0.0.1]:60458 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7Nir-00066J-FW for submit@debbugs.gnu.org; Sun, 07 May 2017 11:03:45 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:45479) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7Nip-00066B-Lo for control@debbugs.gnu.org; Sun, 07 May 2017 11:03:43 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 8EF1A2098C for ; Sun, 7 May 2017 11:03:43 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Sun, 07 May 2017 11:03:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= content-type:date:from:message-id:mime-version:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=g5oAyj A8TSxmiaXC3RcUJdQhRS/YPL5p4Vjxv/0lqHw=; b=ceeHv+JDbdnm0lrpt9p5xK gxyd2im1PRp/1/l3jO22/mV9U/hYKGmO8MgRyHTkMzoKWBq0q9tlLtLzNslCWG90 TgJ6pwr317JkE2pz9U//11+gE4Q7/JrotpBNYeF5zoGG6dd55tO0IfrnskANgd1+ jXbF2RvTpKEJvrWseJAFZECgeDxymb1MJRa+itIOK/wFSN3Msl4I3I7Lgi3Y6B38 /DILUj4B78v9INAFH45MfTy4ZlqKY9j12+VEEjFe8QMkDYd9aCXqO+UZk6lHJbVy YwSfi1BwU0FbcbnJE1bb5eyifN3pJoMbPZk7dhODZP14qG6D+9XoP6c25jg3d15g == DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=g5oAyjA8TSxmiaXC3RcUJdQhRS/YPL5p4Vjxv/0lq Hw=; b=O5iCvyyT+TXwXv/faSVJcZzbsiMknJpmq0RuugyEyT1oH/qvqRCXT4mT0 JzkLakxEzHbDNSPIGpZ5XOgkk7oAeaDKGc8zKYr7x5K9swoRhf/086V6BGTlDB2Z 9tSIFLsmF5hla+dSFoXCd4XtXENuPcktD0MMpu2X3ja4mop64KEga1ZY21XUBAsU GNjms7EQyd2ktcz/cCnkkbhHfqR60Fgpivfv71y6CE/StVhQRES4Ev2QKGZEdnuA IwXWz5bTMxELGDb1P22DJcWtFxPhwRCVTyjloTldMEMvtmLLGQWJ8kPNeZxSozBD wA9zTL1ouGnNMmzr3RTJb+TPD9Bnw== X-ME-Sender: X-Sasl-enc: sdGbyEY00Yd7ApX8U/tcSoUYbdIiBv15W5D2wCahOOdn 1494169423 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 2AA602418B for ; Sun, 7 May 2017 11:03:43 -0400 (EDT) From: Marius Bakke To: control@debbugs.gnu.org Subject: blox User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Sun, 07 May 2017 17:03:24 +0200 Message-ID: <878tm8zp37.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain block 26815 by 26339 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkPN00ACgkQoqBt8qM6 VPpoCAf+OdELW1mCN8Kn0MaVySr6ipo3lFFuCZSVh7RqF7qXKyItrqXTzcgCUy5z 1NM6HuqQXEUqkgWU7rIF20xWiPLSrZSazknBuai6rl0HEEEw7Q+FaUX6ePw2XETg OxflqMPuhBVa1Ib1LmvJpS7DP3Zln8tpaAlthhuKVF6pBu0BdkICyG3UU3Tnisuv Q5ssKvWenaYQI2BQW9PiQu1ERfhhBtXICW2falTb72YtT28iIAaVE4wg3YAn+3vg oSY3veYILjVVXW21sEsgIivgb0OfJux7kitXxKoqvUBlrFYAKyHyY3G9qWu/fzy7 5nAONz9iEIcmbLd/JvpEKWz68iP3WA== =ui4c -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun May 07 11:18:20 2017 Received: (at 26815) by debbugs.gnu.org; 7 May 2017 15:18:20 +0000 Received: from localhost ([127.0.0.1]:60478 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7Nwy-0008Ei-9z for submit@debbugs.gnu.org; Sun, 07 May 2017 11:18:20 -0400 Received: from dd1012.kasserver.com ([85.13.128.8]:48684) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7Nwx-0008Eb-Bd for 26815@debbugs.gnu.org; Sun, 07 May 2017 11:18:19 -0400 Received: from localhost (77.118.221.44.wireless.dyn.drei.com [77.118.221.44]) by dd1012.kasserver.com (Postfix) with ESMTPSA id 2C5F01CA02CA; Sun, 7 May 2017 17:18:16 +0200 (CEST) Date: Sun, 7 May 2017 17:18:14 +0200 From: Danny Milosavljevic To: Marius Bakke Subject: Re: bug#26815: [PATCH 3/3] vm: Support EFI boot in base image. Message-ID: <20170507171814.555ec8b3@scratchpost.org> In-Reply-To: <20170507143647.21036-3-mbakke@fastmail.com> References: <20170507143647.21036-1-mbakke@fastmail.com> <20170507143647.21036-3-mbakke@fastmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) Hi Marius, > + (system* "grub-mkstandalone" "-O" "x86_64-efi" "-o" > + (string-append efi-directory "/EFI/BOOT/BOOTX64.EFI") > + ;; Embed the contents of grubdisk.cfg. > + (string-append "boot/grub/grub.cfg=" target > + "/tmp/grubdisk.cfg")) Check return value of system* ? > (partitions (list (partition > (size #$(- disk-image-size > - (* 10 (expt 2 20)))) > + (* 50 (expt 2 20)))) says: >According to a Microsoft note[2], the minimum size for the EFI System Partition (ESP) would be 100 MB, though this is not stated in the UEFI Specification. Note that for Advanced Format 4K Native drives (4-KB-per-sector) drives, the size is at least 256 MiB, because it is the minimum partition size of FAT32 drives (calculated as sector size (4KB) x 65527 = 256 MiB), due to a limitation of the FAT32 file format. Is this relevant for us? Also, says that F32 is not required for most UEFI firmwares. FAT12, FAT32 usually work. But better be safe than sorry, I guess. > + (size (* 40 (expt 2 20))) > + (label "gnu-esp") > + (file-system "vfat") Is it really vfat with long file names and everything? Or only FAT32 (with short file names)? I ask because a lot of UEFT file names look as if they are for FAT32 with their short all-uppercase names. From debbugs-submit-bounces@debbugs.gnu.org Sun May 07 11:27:03 2017 Received: (at 26815) by debbugs.gnu.org; 7 May 2017 15:27:03 +0000 Received: from localhost ([127.0.0.1]:60483 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7O5P-0008RA-66 for submit@debbugs.gnu.org; Sun, 07 May 2017 11:27:03 -0400 Received: from dd1012.kasserver.com ([85.13.128.8]:49644) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7O5N-0008Ql-6U for 26815@debbugs.gnu.org; Sun, 07 May 2017 11:27:01 -0400 Received: from localhost (77.118.221.44.wireless.dyn.drei.com [77.118.221.44]) by dd1012.kasserver.com (Postfix) with ESMTPSA id 18C511CA02CA; Sun, 7 May 2017 17:27:00 +0200 (CEST) Date: Sun, 7 May 2017 17:26:56 +0200 From: Danny Milosavljevic To: Marius Bakke Subject: Re: bug#26815: [PATCH 2/3] vm: Support creating FAT partitions. Message-ID: <20170507172656.55edb3e9@scratchpost.org> In-Reply-To: <20170507143647.21036-2-mbakke@fastmail.com> References: <20170507143647.21036-1-mbakke@fastmail.com> <20170507143647.21036-2-mbakke@fastmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) Hi Marius, On Sun, 7 May 2017 16:36:46 +0200 Marius Bakke wrote: > +(define* (create-ext-file-system partition type > + #:key label) > + "Create an ext-family filesystem of TYPE on PARTITION. If LABEL is true, > +use that as the volume name." > + (format #t "creating ~a partition...\n" type) > + (apply system* (string-append "mkfs." type) > + "-F" partition > + (if label > + `("-L" ,label) > + '()))) Could you document that the result of the procedure is the system* status? Also, is that wise? I think it should instead do the error handling and (error ...) out on error. It's longer but less surprising. > +(define* (create-fat32-file-system partition > + #:key label) > + "Create a FAT32 filesystem on PARTITION, which must be at least 32 MiB long. > +If LABEL is true, use that as volume name." Same as above. > (define* (format-partition partition type [...] > + (define format-procedure > + (cond > + ((string-prefix? "ext" type) > + (create-ext-file-system partition type #:label label)) > + ((string-suffix? "fat" type) > + (create-fat32-file-system partition #:label label)) > + (else #f))) "format-procedure" is not actually the procedure, right? It's already the formatting-status ... > + (if format-procedure > + (match (status:exit-val format-procedure) > + (0 #t) > + (_ (error "Formatting partition failed."))) > + (error "Unsupported file system."))) status:exit-val will fail when given #f, which it will get in the error case of format-procedure. scheme@(guile-user)> (status:exit-val #f) ERROR: In procedure status:exit-val: ERROR: Wrong type (expecting exact integer): #f > + "nls_iso8859-1" ;for `mkfs.fat`, et.al This adds nls_iso8859-1 unconditionally. OK. Otherwise LGTM. From debbugs-submit-bounces@debbugs.gnu.org Sun May 07 11:29:05 2017 Received: (at 26815) by debbugs.gnu.org; 7 May 2017 15:29:05 +0000 Received: from localhost ([127.0.0.1]:60487 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7O7N-0008UM-JJ for submit@debbugs.gnu.org; Sun, 07 May 2017 11:29:05 -0400 Received: from dd1012.kasserver.com ([85.13.128.8]:49844) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7O7L-0008UE-NF for 26815@debbugs.gnu.org; Sun, 07 May 2017 11:29:04 -0400 Received: from localhost (77.118.221.44.wireless.dyn.drei.com [77.118.221.44]) by dd1012.kasserver.com (Postfix) with ESMTPSA id BA09B1CA02CA; Sun, 7 May 2017 17:29:02 +0200 (CEST) Date: Sun, 7 May 2017 17:28:59 +0200 From: Danny Milosavljevic To: Marius Bakke Subject: Re: bug#26815: [PATCH 1/3] vm: Add support for arbitrary partition flags. Message-ID: <20170507172859.2b81e666@scratchpost.org> In-Reply-To: <20170507143647.21036-1-mbakke@fastmail.com> References: <20170507143505.20724-1-mbakke@fastmail.com> <20170507143647.21036-1-mbakke@fastmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) LGTM! From debbugs-submit-bounces@debbugs.gnu.org Sun May 07 11:41:26 2017 Received: (at 26815) by debbugs.gnu.org; 7 May 2017 15:41:26 +0000 Received: from localhost ([127.0.0.1]:60504 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7OJK-0000LW-9R for submit@debbugs.gnu.org; Sun, 07 May 2017 11:41:26 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:58193) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7OJH-0000LM-0d for 26815@debbugs.gnu.org; Sun, 07 May 2017 11:41:24 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 4FA5520967; Sun, 7 May 2017 11:41:21 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Sun, 07 May 2017 11:41:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=gLWujmWEw/wsLjLLyYx8aNdoHFZT39wCKKxroyCkf 48=; b=p2wiAWtpJvUCUK9mH1zvJivb7e9OdBtEbgWn2D98t682etM5amaCybPLl zto+brnFr4b1WiGnNLbO8Vpcf3YKksTRPhEnIfwBScSIA4sunPRQzdsSE7uoxcfS XZiZeHnImNyTloKdc3rMo4xaE8OVt7ALGakfK+TPJV92GKrFq7GbHsw0RAObxajm nGlubnMVLREDiHRLCgHH3YpAbh3CSTr9MYm1fJF5uOHv7+TQly7aRNeXRCRzPrBB S6fhtzGOdYfuPJc2pr+lRVj4ESQDjw9yyvfEeCBe5TOIa6JCh9b2fuAC9eWuuKyG KLc/daro4i2DO/IWBjBPsgX10TpeQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=gLWujmWEw/wsLjLLyY x8aNdoHFZT39wCKKxroyCkf48=; b=oo1ZpgKxkpkvV8hyXkMATqINk4TlDigm04 xfiBWfyTmdYs8qJ1rgdTVO0BKG4Io7XeVfUqlo/Q+N/UocJRYwgWWk0vMsTIkRU0 NXfEBh5fY6iz6+PSk/YrDIDfehuz7ZiNAJ7Y6bfX2sKiSv9UDiq8GROdC7UYuQeC v0d2JVrz5Tj5oRSROke4P9pKJdmj8xvw1O96XXW+CZyecXyC8Nfnt1ZCd53uPRso JjY6qjTN7/U8VyE+CZZRkKgpBUbHb7CxxwEjuVVyklZt1/vca7e5jB6/CfaT69zK hPqvXiSAzNxuJG0gPRYg80ls5bFMrDNHnCvtnP4ciPWYY/kK2TzA== X-ME-Sender: X-Sasl-enc: WzXzcExLDUmDKwu3Cl6ybHqaJ9RZOMzrbU7M0g+DHdmD 1494171680 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id DCF7B2418B; Sun, 7 May 2017 11:41:20 -0400 (EDT) From: Marius Bakke To: Danny Milosavljevic Subject: Re: bug#26815: [PATCH 3/3] vm: Support EFI boot in base image. In-Reply-To: <20170507171814.555ec8b3@scratchpost.org> References: <20170507143647.21036-1-mbakke@fastmail.com> <20170507143647.21036-3-mbakke@fastmail.com> <20170507171814.555ec8b3@scratchpost.org> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Sun, 07 May 2017 17:41:19 +0200 Message-ID: <874lwwznc0.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi Danny, thanks for the quick feedback! Danny Milosavljevic writes: >> + (system* "grub-mkstandalone" "-O" "x86_64-efi" "-o" >> + (string-append efi-directory "/EFI/BOOT/BOOTX64.EFI") >> + ;; Embed the contents of grubdisk.cfg. >> + (string-append "boot/grub/grub.cfg=3D" target >> + "/tmp/grubdisk.cfg")) > > Check return value of system* ? Good point. Will wrap it in an (unless (zero? ...) (error ...)). >> (partitions (list (partition >> (size #$(- disk-image-size >> - (* 10 (expt 2 20)))) >> + (* 50 (expt 2 20)))) > > says: > >>According to a Microsoft note[2], the minimum size for the EFI System Par= tition (ESP) would be 100 MB, though this is not stated in the UEFI Specifi= cation. Note that for Advanced Format 4K Native drives (4-KB-per-sector) dr= ives, the size is at least 256 MiB, because it is the minimum partition siz= e of FAT32 drives (calculated as sector size (4KB) x 65527 =3D 256 MiB), du= e to a limitation of the FAT32 file format.=20 I have no idea what happens if you dd this image onto a 4k drive, only tested with a 512B flash drive. > Is this relevant for us? > > Also, says that F32 is not require= d for most UEFI firmwares. FAT12, FAT32 usually work. But better be safe t= han sorry, I guess. If FAT32 may cause problems on some install media, perhaps it's better to rely on the calculated allocation tables and "hope for the best". I don't have a spare 4k drive to test with, though. >> + (size (* 40 (expt 2 20))) >> + (label "gnu-esp") >> + (file-system "vfat") > > Is it really vfat with long file names and everything? Or only FAT32 (wit= h short file names)? Good catch. I think it should be FAT32 indeed, according to parted from a prepared disk image. AFAIK parted does not actually use this flag for anything, but it's good to be accurate. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkPQB8ACgkQoqBt8qM6 VPptWQf+PRz1G3sPVzr7NRJQV75bRQtGaHi+G7Rr3IUe5vRWFcWVIsN37JMUw4ak R2mwm6lPwe8SAVgwlx8cY7l2NW/eUXh/s9gaQ2/EUTTcijKb8CTb/BjdHxuyZDF1 nvx1XioUUT+5C/DFfKM831nhK6ZQCwfErBO+opc3OwzRhs4+kqyxqATvX6GAsBCK NLw+dI5q+oF8nPRwfQNHkVAMpSbgzuFXdNav6Kej08ErMeYMNwphO0yEunYdKO5t PuzbXIPtg5pvhD2ZAGXFiJHCOO0Sf+i7WV7LUamlS3R7b/9aZiJG/1QI6IBMClFC 8Q2CM7jTGxQlBxwls1CgUfMmbBnuVQ== =S5PC -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun May 07 11:52:46 2017 Received: (at 26815) by debbugs.gnu.org; 7 May 2017 15:52:46 +0000 Received: from localhost ([127.0.0.1]:60510 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7OUI-0000cd-EZ for submit@debbugs.gnu.org; Sun, 07 May 2017 11:52:46 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:41961) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7OUH-0000cW-FT for 26815@debbugs.gnu.org; Sun, 07 May 2017 11:52:45 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 3E7E52091B; Sun, 7 May 2017 11:52:45 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Sun, 07 May 2017 11:52:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=LqhSpJXUZUwQcz2SDbx9/1e30fGP3aDKCp3Yo96r3 SE=; b=OAGDQCp/MHrwZntr1SHmAgwVicZAVoyKfBiWlZUV4HCpV1lSS/9BdncpX gwmYQdkIeKuBE8gOzpMXOjAqE09xbDTqvSvGZ1mmarTmDOr4ng+npR9JZuAAxTJN 3NzyxhtTBCuAR8jzcnaL0ECN3znqjZglC1kWSZCKYrSza9YkN2PAXWdq9C9R7gL7 hLAM+Y0dpv6ofaEkNCxmLFsfXrCXtZgkQNzG5L333McDSpWsNA3Zd2U1UjgkNlAm ag32Qbv+IF2EB/lLXn1f10hl1GvdO4iMYHw4Cw46prUJaQDUcm1PLS89hHWdqo+K U15YjPfgEOMbsWOQz/ESy88odBi4A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=LqhSpJXUZUwQcz2SDb x9/1e30fGP3aDKCp3Yo96r3SE=; b=BT0ov/fSdOjywcVv5xSEQwDkJxRIGV1d1S 9sqEOwQ2q9q8JEsiXw5Y6b8dp0UtmRDI5VBY5Y7fbEJAFvetQ+XxM/Uj+QYOf5Xr xjAU9K4r25Z5zdSuqS6ZvQnFxpPirDJ9P4gMNHyNGnuTgGU1zAIEL5AbzC3uzRcO MZYdjvIHKpnXwRLSGAFkOLz4J9QL6UVXtmxwpUsfq6uJJMt+MdUb/5+jeU8gYOPU s3Yzu+/KxUHrmaGXA5MbcZKFV5KvyQpl1OQAB6jU/E/sg8hSBSdg7/7gOyemYxYc kWwpMiySVNzMaBtrcuW5d4D1gm6ulK0giY2WnmLa56gIBXtrHrnA== X-ME-Sender: X-Sasl-enc: NlDvTKK0V5K5C/uKm9g1yYEqoV8OEAfoYjtwWPTrRxxi 1494172364 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id C86682418B; Sun, 7 May 2017 11:52:44 -0400 (EDT) From: Marius Bakke To: Danny Milosavljevic Subject: Re: bug#26815: [PATCH 2/3] vm: Support creating FAT partitions. In-Reply-To: <20170507172656.55edb3e9@scratchpost.org> References: <20170507143647.21036-1-mbakke@fastmail.com> <20170507143647.21036-2-mbakke@fastmail.com> <20170507172656.55edb3e9@scratchpost.org> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Sun, 07 May 2017 17:52:43 +0200 Message-ID: <871ss0zmt0.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Danny Milosavljevic writes: > Hi Marius, > > On Sun, 7 May 2017 16:36:46 +0200 > Marius Bakke wrote: >> +(define* (create-ext-file-system partition type >> + #:key label) >> + "Create an ext-family filesystem of TYPE on PARTITION. If LABEL is t= rue, >> +use that as the volume name." >> + (format #t "creating ~a partition...\n" type) >> + (apply system* (string-append "mkfs." type) >> + "-F" partition >> + (if label >> + `("-L" ,label) >> + '()))) > > Could you document that the result of the procedure is the system* status= ? Also, is that wise? I think it should instead do the error handling and= (error ...) out on error. It's longer but less surprising. I had that first, but the error handling was exactly identical, so opted to just handle it in the caller. It does sound safer to handle errors there instead of passing system* around though, will do that in lieu of other comments.=20 >> +(define* (create-fat32-file-system partition >> + #:key label) >> + "Create a FAT32 filesystem on PARTITION, which must be at least 32 Mi= B long. >> +If LABEL is true, use that as volume name." > > Same as above. > >> (define* (format-partition partition type > [...] >> + (define format-procedure >> + (cond >> + ((string-prefix? "ext" type) >> + (create-ext-file-system partition type #:label label)) >> + ((string-suffix? "fat" type) >> + (create-fat32-file-system partition #:label label)) >> + (else #f))) > > "format-procedure" is not actually the procedure, right? It's already the= formatting-status ... Oops, an artifact of rebasing a lot of revisions... >> + (if format-procedure >> + (match (status:exit-val format-procedure) >> + (0 #t) >> + (_ (error "Formatting partition failed."))) >> + (error "Unsupported file system."))) > > status:exit-val will fail when given #f, which it will get in the error c= ase of format-procedure. Thanks for pointing that out. Will re-submit this patch shortly. > scheme@(guile-user)> (status:exit-val #f) > ERROR: In procedure status:exit-val: > ERROR: Wrong type (expecting exact integer): #f > >> + "nls_iso8859-1" ;for `mkfs.fat`, et.al > > This adds nls_iso8859-1 unconditionally. OK. It's required by "dosfstools" which is also added unconditionally. Not sure how to improve it. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkPQssACgkQoqBt8qM6 VPp31Qf+P+nViW5Jexef3/cJOHAwLPvIH58Co1XlfXxiiH++YwlDT/YEBdn8y0A+ E+Z5rIGmYdeMS7VOqiLeWpxluS+RZEZW/eJDjPq22S7kU60L17DgqzfdDZOBlnsh 4wVSIJS9bchT8vDhGm/AceQYQU5Mxw35M6aKYCLC6v6QSmf12s8h2apxDh5vghCK fiCCAZEXmU1MhnmU1emORFl4mIq1EELjsku5M5KHaNusrTam7w5T80GM37jnGcSl ueaZEFzFBRbCLeqJ8otE/KJQmOeGBcZnJv3pIX6DVsTkCLOKBVZUoiIbdLfe60CL g5jsEILJ6uC2P4SELNoKxk9fIPkDYQ== =OySS -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun May 07 12:32:58 2017 Received: (at 26815) by debbugs.gnu.org; 7 May 2017 16:32:58 +0000 Received: from localhost ([127.0.0.1]:60536 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7P7C-0001cF-Et for submit@debbugs.gnu.org; Sun, 07 May 2017 12:32:58 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:51141) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7P7A-0001c7-Iq for 26815@debbugs.gnu.org; Sun, 07 May 2017 12:32:57 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 6AFBA2083A; Sun, 7 May 2017 12:32:56 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Sun, 07 May 2017 12:32:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=LOXcIj bP7P2CM/DQIJT6pgcXFnUvfWY7s+PPs0oW+Xs=; b=wVdDIdrRUQnE/xL6OI+gVa rm7Ed9BCq6CS5v4fg4iNfeyL+TBMkDQooKho/pyv7wg+KwWGtgjm9y4Vm37ofGTb EpEineABODM/h6pmFn91zxuB3f8GHUZvxPsKPVaUreLaOMO06li2SZL6OStLu/Jv qOFiEJ29yzPJU5zeXqEzZQ6tP52U5/bBR4T4mzJFokyCNS3txT6NKix5AYaK+lC/ xYYsOOiqy1RHj11JVdJXGAmw+g0O1DHhGn91if5mEkJ2Okni71FM2dJ5sa1UNs0m MiOeAvEc7WnrnQEuiQl2LAA7M7pC0pladJxBV2oPam7MHVkNVBLWBDihH8Wlyd4A == DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=LOXcIjbP7P2CM/DQIJT6pgcXFnUvfWY7s+PPs0oW+ Xs=; b=h7916CqEJAtx4bjoqW4XcykYCozEBx21F4sNzAasyHRDpvzwkxVEujUgd AAK6ztcMBVF6EFaGj9Wf8stmJ8xZ+SUOp6C/01bLGL90VEi07ThChJN9+seDw7lN /k/XZdkRtGB+4BhFZNX3yx7CzxiWAS39V6MnBXye1dAadNcIgym03oguMePOvTUQ 1KQRjiFDJvYnv3fEBOMql1FWiDB+KPncZ6b4p2I66Sl+PD/I5MRJZN8Dy+OOJ1zI b5//J4fI4/pzV5/teCG+Ar4mjLn1svwvdw0AV9l3FFqetSyL15ZEs2LU3dAdIXva klIsGCqxF008wdND3w73nmZVzm7hw== X-ME-Sender: X-Sasl-enc: T3qi8jX2Sv15fsYhxYMlsolaDm2O1VkEnnoKf/MHSvf+ 1494174775 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id DEB082418B; Sun, 7 May 2017 12:32:55 -0400 (EDT) From: Marius Bakke To: 26815@debbugs.gnu.org Subject: [PATCH v2 2/3] vm: Support creating FAT partitions. Date: Sun, 7 May 2017 18:32:50 +0200 Message-Id: <20170507163250.15109-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <871ss0zmt0.fsf@fastmail.com> References: <871ss0zmt0.fsf@fastmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/build/vm.scm (create-ext-file-system, create-fat-file-system): New procedures. (format-partition): Use them. Error for unknown file systems. * gnu/system/vm.scm (qemu-image): Add DOSFSTOOLS to the closure. * gnu/system/linux-initrd.scm (base-initrd): Add nls_is8859-1.ko regardless of whether a FAT filesystem is present. --- gnu/build/vm.scm | 35 +++++++++++++++++++++++++++++++---- gnu/system/linux-initrd.scm | 4 +--- gnu/system/vm.scm | 2 +- 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 3286ffb02..0b9622bc6 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -214,10 +214,10 @@ actual /dev name based on DEVICE." (define MS_BIND 4096) ; again! -(define* (format-partition partition type - #:key label) - "Create a file system TYPE on PARTITION. If LABEL is true, use that as the -volume name." +(define* (create-ext-file-system partition type + #:key label) + "Create an ext-family filesystem of TYPE on PARTITION. If LABEL is true, +use that as the volume name." (format #t "creating ~a partition...\n" type) (unless (zero? (apply system* (string-append "mkfs." type) "-F" partition @@ -226,6 +226,33 @@ volume name." '()))) (error "failed to create partition"))) +(define* (create-fat-file-system partition + #:key label) + "Create a FAT filesystem on PARTITION. The number of File Allocation Tables +will be determined based on filesystem size. If LABEL is true, use that as the +volume name." + (format #t "creating FAT partition...\n") + (unless (zero? (apply system* "mkfs.fat" partition + (if label + `("-n" ,label) + '()))) + (error "failed to create FAT partition"))) + +(define* (format-partition partition type + #:key label) + "Create a file system TYPE on PARTITION. If LABEL is true, use that as the +volume name." + (define format-procedure + (cond + ((string-prefix? "ext" type) + (create-ext-file-system partition type #:label label)) + ((string-suffix? "fat" type) + (create-fat-file-system partition #:label label)) + (else #f))) + (if format-procedure + format-procedure + (error "Unsupported file system."))) + (define (initialize-partition partition) "Format PARTITION, a object with a non-#f 'device' field, mount it, run its initializer, and unmount it." diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index dfe198e43..3a5e76034 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -268,6 +268,7 @@ loaded at boot time in the order in which they appear." "usbhid" "hid-generic" "hid-apple" ;keyboards during early boot "dm-crypt" "xts" "serpent_generic" "wp512" ;for encrypted root partitions "nvme" ;for new SSD NVMe devices + "nls_iso8859-1" ;for `mkfs.fat`, et.al ,@(if (string-match "^(x86_64|i[3-6]86)-" (%current-system)) '("pata_acpi" "pata_atiixp" ;for ATA controllers "isci") ;for SAS controllers like Intel C602 @@ -281,9 +282,6 @@ loaded at boot time in the order in which they appear." ,@(if (find (file-system-type-predicate "9p") file-systems) virtio-9p-modules '()) - ,@(if (find (file-system-type-predicate "vfat") file-systems) - '("nls_iso8859-1") - '()) ,@(if (find (file-system-type-predicate "btrfs") file-systems) '("btrfs") '()) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 42c7690b1..099e3fac3 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -202,7 +202,7 @@ the image." (guix build utils)) (let ((inputs - '#$(append (list qemu parted e2fsprogs) + '#$(append (list qemu parted e2fsprogs dosfstools) (map canonical-package (list sed grep coreutils findutils gawk)) (if register-closures? (list guix) '()))) -- 2.12.2 From debbugs-submit-bounces@debbugs.gnu.org Sun May 07 13:06:45 2017 Received: (at 26815) by debbugs.gnu.org; 7 May 2017 17:06:45 +0000 Received: from localhost ([127.0.0.1]:60575 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7Pdt-0002Qh-2g for submit@debbugs.gnu.org; Sun, 07 May 2017 13:06:45 -0400 Received: from dd1012.kasserver.com ([85.13.128.8]:60974) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7Pdr-0002Qa-Vp for 26815@debbugs.gnu.org; Sun, 07 May 2017 13:06:44 -0400 Received: from localhost (77.118.221.44.wireless.dyn.drei.com [77.118.221.44]) by dd1012.kasserver.com (Postfix) with ESMTPSA id 938531CA02CA; Sun, 7 May 2017 19:06:42 +0200 (CEST) Date: Sun, 7 May 2017 19:06:37 +0200 From: Danny Milosavljevic To: Marius Bakke Subject: Re: bug#26815: [PATCH 2/3] vm: Support creating FAT partitions. Message-ID: <20170507190637.0bf9c4ce@scratchpost.org> In-Reply-To: <871ss0zmt0.fsf@fastmail.com> References: <20170507143647.21036-1-mbakke@fastmail.com> <20170507143647.21036-2-mbakke@fastmail.com> <20170507172656.55edb3e9@scratchpost.org> <871ss0zmt0.fsf@fastmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) Hi Marius, On Sun, 07 May 2017 17:52:43 +0200 Marius Bakke wrote: > I had that first, but the error handling was exactly identical, so opted > to just handle it in the caller. It does sound safer to handle errors > there instead of passing system* around though, will do that in lieu of > other comments. Yeah, I did that in the past, too (and for many things still do). But this procedure is critical enough that ignoring the return value would do some very strange things - and for those I lately do defensive programming. > > "format-procedure" is not actually the procedure, right? It's already the formatting-status ... > > Oops, an artifact of rebasing a lot of revisions... Your v2 patch still calls it that :) > > This adds nls_iso8859-1 unconditionally. OK. > > It's required by "dosfstools" which is also added unconditionally. > Not sure how to improve it. Oh, it's fine. It's just for other reviewers and future-me so that I don't have to think about why this is done again... From debbugs-submit-bounces@debbugs.gnu.org Sun May 07 15:15:34 2017 Received: (at 26815) by debbugs.gnu.org; 7 May 2017 19:15:34 +0000 Received: from localhost ([127.0.0.1]:60730 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7ReX-0007rr-Nb for submit@debbugs.gnu.org; Sun, 07 May 2017 15:15:34 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:41445) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7ReV-0007p0-0a for 26815@debbugs.gnu.org; Sun, 07 May 2017 15:15:31 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id EE7A2205BA; Sun, 7 May 2017 15:15:30 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Sun, 07 May 2017 15:15:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=U0cA0om/eJyX83yIp2hVLR/pwDKHFg2D67biYvIxH Q4=; b=cwRQt/JGpmSEiyQTuzhSktxxpSWShr9xjDanESksOrDMoizXVp/1jWx8q gsSmtHwfEYFXb2s1o61F0J1Gfsb3/0ly8+qt2Dmc9U2eGNZCtlJRQtSQp2WbpHjN CEqDL30oKFyR0O88SiHJP4AZshLRIL54LCtj25I5OQIsRX6faBdroWvnW1f0Y4h+ 1cNzIRcjFDeF8qLZ6AjBjUaEXgtPw0wGYf7N9ZxH99J+SUuqoR45OhJ0AezI8g94 OADkCP5UfHai3dBAWB+QHdb0wPEVfREJzwRUHYnYWM56SUBUYaxXFWUssMtcskg2 w1QpNWRL5NvNDzzNo0Oj/tONNMoEQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=U0cA0om/eJyX83yIp2 hVLR/pwDKHFg2D67biYvIxHQ4=; b=HfEhZ+RI98CUe5N9+qfW86atAugzx+nUbU g5zAViCkBtWAJbmY+pSoHdcncQLDUn/ExMkBaMa4cgur6D/qKy2/iMbpppTpAt72 JH4567fjftaMxDbbVmnVhDuoFIVf62CdmceU5gYJRCio47XtuqIemuu0OibQe423 t9D+xQ1bX4l7xztHwcnrWS/eFcuSJtP2EO/wMwiQGQvjr9lviaMwEPbwdImRlRBV TN5JcNs2NQExldcH280CAy7n2dOk+oLikCGrkSX04amHNJGAuCfJI05kTUGLOb9L auu62IjeoAh7rAwSM86ilHI9HjBtsjL1TQ7KGLiocxOAN9IScgbQ== X-ME-Sender: X-Sasl-enc: oxMn+c3xuqEHkgigVf22gQVt2hhjBgcQ9yNP+lpRFsEk 1494184530 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 7A6F32415E; Sun, 7 May 2017 15:15:30 -0400 (EDT) From: Marius Bakke To: Danny Milosavljevic Subject: Re: bug#26815: [PATCH 2/3] vm: Support creating FAT partitions. In-Reply-To: <20170507190637.0bf9c4ce@scratchpost.org> References: <20170507143647.21036-1-mbakke@fastmail.com> <20170507143647.21036-2-mbakke@fastmail.com> <20170507172656.55edb3e9@scratchpost.org> <871ss0zmt0.fsf@fastmail.com> <20170507190637.0bf9c4ce@scratchpost.org> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Sun, 07 May 2017 21:15:28 +0200 Message-ID: <87tw4wxyun.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Danny Milosavljevic writes: > Hi Marius, > > On Sun, 07 May 2017 17:52:43 +0200 > Marius Bakke wrote: > >> I had that first, but the error handling was exactly identical, so opted >> to just handle it in the caller. It does sound safer to handle errors >> there instead of passing system* around though, will do that in lieu of >> other comments.=20 > > Yeah, I did that in the past, too (and for many things still do). But th= is procedure is critical enough that ignoring the return value would do som= e very strange things - and for those I lately do defensive programming. > >> > "format-procedure" is not actually the procedure, right? It's already = the formatting-status ...=20=20 >>=20 >> Oops, an artifact of rebasing a lot of revisions... > > Your v2 patch still calls it that :) D'oh. It could of course be much simpler after removing the error handling too.. v3 attached. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-vm-Support-creating-FAT-partitions.patch Content-Transfer-Encoding: quoted-printable From=2044c112dfe0d92847f32040d558f5970ae99c600d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 6 May 2017 22:53:58 +0200 Subject: [PATCH] vm: Support creating FAT partitions. * gnu/build/vm.scm (create-ext-file-system, create-fat-file-system): New pr= ocedures. (format-partition): Use procedures. Error for unknown file systems. * gnu/system/vm.scm (qemu-image): Add DOSFSTOOLS to the closure. * gnu/system/linux-initrd.scm (base-initrd): Add nls_is8859-1.ko regardless= of whether a FAT filesystem is present. =2D-- gnu/build/vm.scm | 31 +++++++++++++++++++++++++++---- gnu/system/linux-initrd.scm | 4 +--- gnu/system/vm.scm | 2 +- 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 3286ffb02..206696ef6 100644 =2D-- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -214,10 +214,10 @@ actual /dev name based on DEVICE." =20 (define MS_BIND 4096) ; again! =20 =2D(define* (format-partition partition type =2D #:key label) =2D "Create a file system TYPE on PARTITION. If LABEL is true, use that a= s the =2Dvolume name." +(define* (create-ext-file-system partition type + #:key label) + "Create an ext-family filesystem of TYPE on PARTITION. If LABEL is true, +use that as the volume name." (format #t "creating ~a partition...\n" type) (unless (zero? (apply system* (string-append "mkfs." type) "-F" partition @@ -226,6 +226,29 @@ volume name." '()))) (error "failed to create partition"))) =20 +(define* (create-fat-file-system partition + #:key label) + "Create a FAT filesystem on PARTITION. The number of File Allocation Ta= bles +will be determined based on filesystem size. If LABEL is true, use that a= s the +volume name." + (format #t "creating FAT partition...\n") + (unless (zero? (apply system* "mkfs.fat" partition + (if label + `("-n" ,label) + '()))) + (error "failed to create FAT partition"))) + +(define* (format-partition partition type + #:key label) + "Create a file system TYPE on PARTITION. If LABEL is true, use that as = the +volume name." + (cond + ((string-prefix? "ext" type) + (create-ext-file-system partition type #:label label)) + ((string-suffix? "fat" type) + (create-fat-file-system partition #:label label)) + (else (error "Unsupported file system.")))) + (define (initialize-partition partition) "Format PARTITION, a object with a non-#f 'device' field, mo= unt it, run its initializer, and unmount it." diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index dfe198e43..3a5e76034 100644 =2D-- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -268,6 +268,7 @@ loaded at boot time in the order in which they appear." "usbhid" "hid-generic" "hid-apple" ;keyboards during early boot "dm-crypt" "xts" "serpent_generic" "wp512" ;for encrypted root parti= tions "nvme" ;for new SSD NVMe devices + "nls_iso8859-1" ;for `mkfs.fat`, et.al ,@(if (string-match "^(x86_64|i[3-6]86)-" (%current-system)) '("pata_acpi" "pata_atiixp" ;for ATA controllers "isci") ;for SAS controllers like Intel= C602 @@ -281,9 +282,6 @@ loaded at boot time in the order in which they appear." ,@(if (find (file-system-type-predicate "9p") file-systems) virtio-9p-modules '()) =2D ,@(if (find (file-system-type-predicate "vfat") file-systems) =2D '("nls_iso8859-1") =2D '()) ,@(if (find (file-system-type-predicate "btrfs") file-systems) '("btrfs") '()) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 42c7690b1..099e3fac3 100644 =2D-- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -202,7 +202,7 @@ the image." (guix build utils)) =20 (let ((inputs =2D '#$(append (list qemu parted e2fsprogs) + '#$(append (list qemu parted e2fsprogs dosfstools) (map canonical-package (list sed grep coreutils findutils gawk)) (if register-closures? (list guix) '()))) =2D-=20 2.12.2 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkPclEACgkQoqBt8qM6 VPqKHggAs1/WygNEtgPM6m5Ml9cN9HjCmwpkrW/xOusSccOGd/4bSpm8LP+5RScC nA/VALLz0NJecGWUQr+ejUtVKPbU5jERwMrFMDYQ2Dq5MiJ0kW89DgKgFaQ4sCV2 AquTpiYe1oFOGQ1X9k1ITqRaP9xPJRyWLhXC27psUCw57rT2lRmjQyi3n41bmLem WNcsQs360tAjM3NG/VK8ctmLk6bcKrPEJRH3wmGS3COvUBQN7ijZQ11LciG6MNAo yxo0Esf8VLQKUtvYrf6wx4DDGStdtbrFj940Z++mH8BccvdpoJV5l0NhB/JR0VOV 8dma3fh3oHHdROAn9GiiFTJuFPdGWA== =P6c2 -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun May 07 15:17:54 2017 Received: (at 26815) by debbugs.gnu.org; 7 May 2017 19:17:54 +0000 Received: from localhost ([127.0.0.1]:60742 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7Rgm-0000nM-Eo for submit@debbugs.gnu.org; Sun, 07 May 2017 15:17:54 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:58125) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7Rgl-0000nD-9D for 26815@debbugs.gnu.org; Sun, 07 May 2017 15:17:51 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 386402083A; Sun, 7 May 2017 15:17:51 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Sun, 07 May 2017 15:17:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=A0KYwPCiwem3FZyDRAeAeA+Ufy4gCo37gkL2tGk6W t4=; b=ePugwO7cdm2W7oeEgQqJhv7B9gNtSZdJCgbuk1iNNnLttdOp7lUq8sVMi 6rLzr+uz0zvWFwJ1FmWp7dOs5ju867WF71L09Li+oi2S+Z8EMafjzPqrrouFr2Qw P4P3tIFcaDMjP2oxVRFwor79I7BpgXJoXTRXPalddfk6EMJrvRtW2+1AYwSucx4z fpkydWHTwjFl48F2xFHVzlYEHGQ1mGCOUHMYV5kciWl7LQGSqtj/pPSdTl4Tjp8U bMZsXY2R03kBv/zDlYXAUEOGQX5DqoAyW0WXjXIfVClUaAq3VXFefEHSR8ueAZFL cupGJ6EX1jRhNh9Z7cFDCitDiVk+Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=A0KYwPCiwem3FZyDRA eAeA+Ufy4gCo37gkL2tGk6Wt4=; b=CfnjCc46eYOjAJjLK0cOJaKndZ45/5r77Z mZ9ALeTg+OwhemFCyCvhx6+/7si8S40vqjzYrchLZMaQjEDcTI16cWXQpGiD+B/a sVDJfmSjL7F2UPEgYwfJnRdwC967Amj3NObJm8j3qf3l40CH7mav9Ni1x8fMMVoA kt5X1/tHw3jFRHGbpFwF4nE9kqbO2f4Gu7mV4vC2ceaD5+LOLVlRI/gbbsiSkmC3 sp3cuQQeAYSnWx03OoBaSMisZd0oP5rb5QrxefC9SJ/RRN3IsMWJWR2kCPedUuJL AshA+Lnoj5yl8omksYWc//qcX7mIxz89F1A6Y3tTpeVo4VfYruUg== X-ME-Sender: X-Sasl-enc: 59FB5GLI1WnHi7EMnQ3ScppdPi4xND+vJVmA+QtuMn89 1494184670 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id BBAEF244DA; Sun, 7 May 2017 15:17:50 -0400 (EDT) From: Marius Bakke To: Danny Milosavljevic Subject: Re: bug#26815: [PATCH 3/3] vm: Support EFI boot in base image. In-Reply-To: <20170507171814.555ec8b3@scratchpost.org> References: <20170507143647.21036-1-mbakke@fastmail.com> <20170507143647.21036-3-mbakke@fastmail.com> <20170507171814.555ec8b3@scratchpost.org> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Sun, 07 May 2017 21:17:49 +0200 Message-ID: <87r300xyqq.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Danny Milosavljevic writes: > Hi Marius, > >> + (system* "grub-mkstandalone" "-O" "x86_64-efi" "-o" >> + (string-append efi-directory "/EFI/BOOT/BOOTX64.EFI") >> + ;; Embed the contents of grubdisk.cfg. >> + (string-append "boot/grub/grub.cfg=" target >> + "/tmp/grubdisk.cfg")) > > Check return value of system* ? I rewrote most of this to be (hopefully) more understandable. Also, some rudimentary steps towards other platforms, native testing required. V2 attached. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-vm-Support-EFI-boot-in-base-image.patch Content-Transfer-Encoding: quoted-printable From=20e94c9071c53db28c3e73998654b185c36a210df6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 May 2017 15:31:30 +0200 Subject: [PATCH] vm: Support EFI boot in base image. * gnu/system/vm.scm (qemu-image): Add GRUB-EFI to inputs. Append 40MB EFI System Partition. * gnu/build/vm.scm (initialize-hard-disk): Generate grub EFI blob when ESP = is present. =2D-- gnu/build/vm.scm | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++= +++- gnu/system/vm.scm | 14 ++++++++++--- 2 files changed, 69 insertions(+), 4 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 206696ef6..8b4a44579 100644 =2D-- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -27,6 +27,7 @@ #:use-module (gnu build linux-boot) #:use-module (gnu build install) #:use-module (guix records) + #:use-module (ice-9 format) #:use-module (ice-9 match) #:use-module (ice-9 regex) #:use-module (srfi srfi-1) @@ -334,9 +335,16 @@ passing it a directory name where it is mounted." "Return the first partition found with the boot flag set." (member 'boot (partition-flags partitions))) =20 + (define (partition-esp? partitions) + "Return the first EFI System Partition." + (member 'esp (partition-flags partitions))) + (let* ((partitions (initialize-partition-table device partitions)) (root (find partition-bootable? partitions)) =2D (target "/fs")) + (esp (find partition-esp? partitions)) + (target "/fs") + ;; Grub expects to find an EFI System Partition here. + (efi-directory (string-append target "/boot/efi"))) (unless root (error "no bootable partition specified" partitions)) =20 @@ -346,6 +354,55 @@ passing it a directory name where it is mounted." (mkdir-p target) (mount (partition-device root) target (partition-file-system root)) (install-boot-config bootcfg bootcfg-location target) + + ;; If we have an ESP partition, generate a self-contained grub EFI + ;; image and write it to a well-known location. + (when esp + (let* ((system %host-type) + (efi-payload-directory (string-append efi-directory "/EFI/BOO= T")) + (efi-payload-file-name (if (any (cute string-prefix? <> syste= m) + '("i686" "armhf")) + "BOOTX32.EFI" ;hail mary + "BOOTX64.EFI")) ;fairly suppor= ted + (efi-payload-format (cond + ((string-prefix? "x86_64" system) + "x86_64-efi") + ((string-prefix? "i686" system) + "i386-efi") + ((string-prefix? "armhf" system) + "arm-efi") + ((string-prefix? "aarch64" system) + "arm64-efi"))) + (grub-tmp (string-append target "/tmp")) + (grub.cfg (string-append grub-tmp "/grub.cfg"))) + (display "mounting EFI system partition...\n") + (mkdir-p efi-directory) + (mount (partition-device esp) efi-directory + (partition-file-system esp)) + (mkdir-p efi-payload-directory) + + ;; Grub needs a tmpdir to prepare the image. + (setenv "TMPDIR" grub-tmp) + ;; We also need a tiny configuration file telling the EFI blob whe= re + ;; to find the real thing. + (with-output-to-file grub.cfg + (lambda _ + (format #t + "insmod part_msdos~@ + search --set=3Droot --label gnu-disk-image~@ + configfile /boot/grub/grub.cfg~%"))) + (display "creating grub firmware image...\n") + (unless (zero? (system* "grub-mkstandalone" "-O" efi-payload-format + "-o" (string-append efi-payload-directory = "/" + efi-payload-file-name) + ;; Graft the contents of our configuration= file + ;; into the image. See grub-mkstandalone(= 1). + (string-append "boot/grub/grub.cfg=3D" gru= b.cfg))) + (error "failed to create grub EFI image")) + + (delete-file grub.cfg) + (umount efi-directory))) + (when bootloader-installer (bootloader-installer bootloader device target)) =20 diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 099e3fac3..04ccc3650 100644 =2D-- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -3,6 +3,7 @@ ;;; Copyright =C2=A9 2016 Christopher Allan Webber ;;; Copyright =C2=A9 2016 Leo Famulari ;;; Copyright =C2=A9 2017 Mathieu Othacehe +;;; Copyright =C2=A9 2017 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -202,7 +203,7 @@ the image." (guix build utils)) =20 (let ((inputs =2D '#$(append (list qemu parted e2fsprogs dosfstools) + '#$(append (list qemu parted e2fsprogs dosfstools grub-efi) (map canonical-package (list sed grep coreutils findutils gawk)) (if register-closures? (list guix) '()))) @@ -227,11 +228,18 @@ the image." #:system-directory #$os.drv)) (partitions (list (partition (size #$(- disk-image-size =2D (* 10 (expt 2 20)))) + (* 50 (expt 2 20)))) (label #$file-system-label) (file-system #$file-system-type) (flags '(boot)) =2D (initializer initialize))))) + (initializer initialize)) + (partition + ;; Append a small FAT32 partition for + ;; use with UEFI bootloaders. + (size (* 40 (expt 2 20))) + (label "gnu-esp") + (file-system "vfat") + (flags '(esp)))))) (initialize-hard-disk "/dev/vda" #:partitions partitions #:bootloader =2D-=20 2.12.2 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkPct0ACgkQoqBt8qM6 VPq60QgAhWPFxpI/bI38befXrrz3ytCKAr+aoVdARRiUqS5wXeG1jczWb+oLk29m MgqpbX42kPEpRDhYQrY+Vzogdou2PLdI+HQhSUR2/6QODwSo3XRLFkhoMf+JYjwH bAuxw9hNjgioD9f1vLAZ9+egSFzB0xr0At+BvBz99Lve97FMjJdWblLUZnCjGTXQ 3LFt9Na8ZKKjcQdF10t2enYiqsNHRERHsIWHBnF7AjWSPQT6j42RNnHKD8GDXOuC zTtaw3SFj9AQZ1qAU9/JOoVvF6fQ3kftaBolIt84j9aI6qYq2Sr7bnjgDR8p7yxO 5iOOSel6KYAWkA+ZhLKMw+bStrOKng== =aF6s -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun May 07 16:07:56 2017 Received: (at 26815) by debbugs.gnu.org; 7 May 2017 20:07:56 +0000 Received: from localhost ([127.0.0.1]:60797 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7STE-0003ok-8W for submit@debbugs.gnu.org; Sun, 07 May 2017 16:07:56 -0400 Received: from dd1012.kasserver.com ([85.13.128.8]:57024) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7STC-0003oc-8q for 26815@debbugs.gnu.org; Sun, 07 May 2017 16:07:54 -0400 Received: from localhost (77.118.221.44.wireless.dyn.drei.com [77.118.221.44]) by dd1012.kasserver.com (Postfix) with ESMTPSA id 4AE0F1CA0438; Sun, 7 May 2017 22:07:53 +0200 (CEST) Date: Sun, 7 May 2017 22:07:51 +0200 From: Danny Milosavljevic To: Marius Bakke Subject: Re: bug#26815: [PATCH 2/3] vm: Support creating FAT partitions. Message-ID: <20170507220751.4d45ece0@scratchpost.org> In-Reply-To: <87tw4wxyun.fsf@fastmail.com> References: <20170507143647.21036-1-mbakke@fastmail.com> <20170507143647.21036-2-mbakke@fastmail.com> <20170507172656.55edb3e9@scratchpost.org> <871ss0zmt0.fsf@fastmail.com> <20170507190637.0bf9c4ce@scratchpost.org> <87tw4wxyun.fsf@fastmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) >+(define* (format-partition partition type >+ #:key label) >+ "Create a file system TYPE on PARTITION. If LABEL is true, use that as the >+volume name." >+ (cond >+ ((string-prefix? "ext" type) >+ (create-ext-file-system partition type #:label label)) >+ ((string-suffix? "fat" type) >+ (create-fat-file-system partition #:label label)) >+ (else (error "Unsupported file system.")))) ^^^ Indentation of the "else" is strange. Otherwise LGTM! From debbugs-submit-bounces@debbugs.gnu.org Mon May 08 05:06:37 2017 Received: (at 26815) by debbugs.gnu.org; 8 May 2017 09:06:37 +0000 Received: from localhost ([127.0.0.1]:32919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7ecj-0004vM-NF for submit@debbugs.gnu.org; Mon, 08 May 2017 05:06:37 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:41427) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7ecg-0004vC-Rq for 26815@debbugs.gnu.org; Mon, 08 May 2017 05:06:31 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 7B053208F0; Mon, 8 May 2017 05:06:30 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 08 May 2017 05:06:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=ZWntKSr/ST+lM3oVRcKBoQ+TT74RXuu7MEV7z3F/h QI=; b=wdNWXzarj7wfyswrSwZJYObB2Crb30F1FHA18vEExRtkeagZ2VX5w1KYX NVuGsrUHJ+dOWJqx8Spom8jH39D9t5dk0TMeUZf+EDu/CkNJEmxBfoXh0uvzvyVc 7t8lrpDKtrCJPdF9xRer6Q7C7JxxAdRr2uwe/icScJ90fOASncykqB01XWXP3Has H037akd7krr89hMyVT+iva+3FWKix+OwZwqwK3NxOXrcBXyi+QI7HrpelePcHRSJ VoLm3GnEJPMb10CmNPZ7IsP/w92uNr8EJCWYkCvlELlKOPD0I/lCNxuilsRV8ko6 sXwv9pcrigDzD8kpRfX4tkO9FjgZw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=ZWntKSr/ST+lM3oVRc KBoQ+TT74RXuu7MEV7z3F/hQI=; b=GycoX0Rv3RAfGkhPqfzPR1R+3RKI23QlEA 6S9hYRVW+ZbWARftK4TIf1MJ5deoaWiAZzu/9/coioTxCqIJK43PgcS2Iww4L/Rt HsgQzzm36sIepPd1OTSTrwprO4SJEtAZcxM0KhgGUzE+v6LmBw8XcVDqa7mT1SwP 7aFJPlEvrfn8Hmv9mzQPvQGpnGl/SU85NpY0nGnAEUJXiuuTHEY5Vo/0lJNNnQ94 7Crtxa5F49U25DjWveKa9kzSt2KEd6SyLrtYG0DkER44q4FDhwDqu2KLBtg9NOHw OZpmJxoolDtoQKNwbVSuyok8QRX1xob/4gE7X/Hvfs6oF2dKxaTg== X-ME-Sender: X-Sasl-enc: KRRMZtHyFfcuWzztnA69I+T6d8FRtVuIddS2+bW9gs6G 1494234389 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id F12B97E9CC; Mon, 8 May 2017 05:06:29 -0400 (EDT) From: Marius Bakke To: Danny Milosavljevic Subject: Re: bug#26815: [PATCH 3/3] vm: Support EFI boot in base image. In-Reply-To: <87r300xyqq.fsf@fastmail.com> References: <20170507143647.21036-1-mbakke@fastmail.com> <20170507143647.21036-3-mbakke@fastmail.com> <20170507171814.555ec8b3@scratchpost.org> <87r300xyqq.fsf@fastmail.com> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Mon, 08 May 2017 11:06:28 +0200 Message-ID: <87d1bjyay3.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Marius Bakke writes: > Danny Milosavljevic writes: > >> Hi Marius, >> >>> + (system* "grub-mkstandalone" "-O" "x86_64-efi" "-o" >>> + (string-append efi-directory "/EFI/BOOT/BOOTX64.EFI") >>> + ;; Embed the contents of grubdisk.cfg. >>> + (string-append "boot/grub/grub.cfg=" target >>> + "/tmp/grubdisk.cfg")) >> >> Check return value of system* ? > > I rewrote most of this to be (hopefully) more understandable. Also, some > rudimentary steps towards other platforms, native testing required. > > V2 attached. ...and here is V3, now with compliant file names for all supported arches from the UEFI specification. Will test i386 later today. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-vm-Support-EFI-boot-in-base-image.patch Content-Transfer-Encoding: quoted-printable From=209555239cfc9362a15cc3f255040c410395d49e04 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 May 2017 15:31:30 +0200 Subject: [PATCH] vm: Support EFI boot in base image. * gnu/system/vm.scm (qemu-image): Add GRUB-EFI to inputs. Append 40MB EFI System Partition. * gnu/build/vm.scm (initialize-hard-disk): Generate grub EFI blob when ESP = is present. =2D-- gnu/build/vm.scm | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++= +++- gnu/system/vm.scm | 14 +++++++++++--- 2 files changed, 68 insertions(+), 4 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 70e66fb35..57056fced 100644 =2D-- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -27,6 +27,7 @@ #:use-module (gnu build linux-boot) #:use-module (gnu build install) #:use-module (guix records) + #:use-module (ice-9 format) #:use-module (ice-9 match) #:use-module (ice-9 regex) #:use-module (srfi srfi-1) @@ -334,9 +335,16 @@ passing it a directory name where it is mounted." "Return the first partition found with the boot flag set." (member 'boot (partition-flags partitions))) =20 + (define (partition-esp? partitions) + "Return the first EFI System Partition." + (member 'esp (partition-flags partitions))) + (let* ((partitions (initialize-partition-table device partitions)) (root (find partition-bootable? partitions)) =2D (target "/fs")) + (esp (find partition-esp? partitions)) + (target "/fs") + ;; Grub expects to find an EFI System Partition here. + (efi-directory (string-append target "/boot/efi"))) (unless root (error "no bootable partition specified" partitions)) =20 @@ -346,6 +354,54 @@ passing it a directory name where it is mounted." (mkdir-p target) (mount (partition-device root) target (partition-file-system root)) (install-boot-config bootcfg bootcfg-location target) + + ;; If we have an ESP partition, generate a self-contained grub EFI + ;; image and write it to a well-known location. + (when esp + (let* ((system %host-type) + (efi-payload-directory (string-append efi-directory "/EFI/BOO= T")) + ;; Map the grub targets to the boot file names expected by + ;; UEFI compliant firmware. See "Removable Media Boot Behavio= r": + ;; http://www.uefi.org/sites/default/files/resources/UEFI%20S= pec%202_6.pdf + (efi-target-map (cond + ((string-prefix? "x86_64" system) + '("x86_64-efi" . "BOOTX64.EFI")) + ((string-prefix? "i686" system) + '("i386-efi" . "BOOTIA32.EFI")) + ((string-prefix? "armhf" system) + '("arm-efi" . "BOOTARM.EFI")) + ((string-prefix? "aarch64" system) + '("arm64-efi" . "BOOTAA64.EFI")))) + (grub-tmp (string-append target "/tmp")) + (grub.cfg (string-append grub-tmp "/grub.cfg"))) + (display "mounting EFI system partition...\n") + (mkdir-p efi-directory) + (mount (partition-device esp) efi-directory + (partition-file-system esp)) + (mkdir-p efi-payload-directory) + + ;; Grub needs a tmpdir to prepare the image. + (setenv "TMPDIR" grub-tmp) + ;; We also need a tiny configuration file telling the EFI blob whe= re + ;; to find the real thing. + (with-output-to-file grub.cfg + (lambda _ + (format #t + "insmod part_msdos~@ + search --set=3Droot --label gnu-disk-image~@ + configfile /boot/grub/grub.cfg~%"))) + (display "creating grub firmware image...\n") + (unless (zero? (system* "grub-mkstandalone" "-O" (car efi-target-m= ap) + "-o" (string-append efi-payload-directory = "/" + (cdr efi-target-map)) + ;; Graft the contents of our configuration= file + ;; into the image. See grub-mkstandalone(= 1). + (string-append "boot/grub/grub.cfg=3D" gru= b.cfg))) + (error "failed to create grub EFI image")) + + (delete-file grub.cfg) + (umount efi-directory))) + (when bootloader-installer (bootloader-installer bootloader device target)) =20 diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 099e3fac3..04ccc3650 100644 =2D-- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -3,6 +3,7 @@ ;;; Copyright =C2=A9 2016 Christopher Allan Webber ;;; Copyright =C2=A9 2016 Leo Famulari ;;; Copyright =C2=A9 2017 Mathieu Othacehe +;;; Copyright =C2=A9 2017 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -202,7 +203,7 @@ the image." (guix build utils)) =20 (let ((inputs =2D '#$(append (list qemu parted e2fsprogs dosfstools) + '#$(append (list qemu parted e2fsprogs dosfstools grub-efi) (map canonical-package (list sed grep coreutils findutils gawk)) (if register-closures? (list guix) '()))) @@ -227,11 +228,18 @@ the image." #:system-directory #$os.drv)) (partitions (list (partition (size #$(- disk-image-size =2D (* 10 (expt 2 20)))) + (* 50 (expt 2 20)))) (label #$file-system-label) (file-system #$file-system-type) (flags '(boot)) =2D (initializer initialize))))) + (initializer initialize)) + (partition + ;; Append a small FAT32 partition for + ;; use with UEFI bootloaders. + (size (* 40 (expt 2 20))) + (label "gnu-esp") + (file-system "vfat") + (flags '(esp)))))) (initialize-hard-disk "/dev/vda" #:partitions partitions #:bootloader =2D-=20 2.12.2 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkQNRQACgkQoqBt8qM6 VPoNcwgAlZiEWvNKRz4SQ2JcmINGLrrT57hQXUDGvcQ2PxQPiIeCG+RMQxp+sRom cNYNPrmZ6aPDQ7XxXhOFepIHkLIXuvt09j77XMJhPp8a3L4am7aYcqn8ccOeVzez OFOHKhzrC419ToUeVYzBalvumarvC4MWRUrJBKJZtWij4g13JENFJokMrXOgxpqY OEyirr21KcZv2qMJ1Rg1hjlO/AU82lJRQJ6BmmqNxOiLRZYTccmNYv6SrH00YI5v 7UNkGUx8cOtFKyZjYaMwq0cn28S5wYA+UTkhEHt9qWdDDC+QtiEIQm0JecIT8fIp FYUYA48b4IdFS7FvMHNuKMmbOfJ7sg== =bh7x -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon May 08 10:41:55 2017 Received: (at control) by debbugs.gnu.org; 8 May 2017 14:41:55 +0000 Received: from localhost ([127.0.0.1]:34491 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7jrH-0006WB-8U for submit@debbugs.gnu.org; Mon, 08 May 2017 10:41:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48038) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7jrG-0006Vz-5r for control@debbugs.gnu.org; Mon, 08 May 2017 10:41:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7jr7-0005Js-U3 for control@debbugs.gnu.org; Mon, 08 May 2017 10:41:49 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:52868) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7jr7-0005Jl-Qu for control@debbugs.gnu.org; Mon, 08 May 2017 10:41:45 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:57096 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d7jr7-0007zV-4h for control@debbugs.gnu.org; Mon, 08 May 2017 10:41:45 -0400 Date: Mon, 08 May 2017 16:41:43 +0200 Message-Id: <87r2zzl8bc.fsf@gnu.org> To: control@debbugs.gnu.org From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: control message for bug #26815 MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) severity 26815 important From debbugs-submit-bounces@debbugs.gnu.org Mon May 08 10:43:24 2017 Received: (at 26815) by debbugs.gnu.org; 8 May 2017 14:43:24 +0000 Received: from localhost ([127.0.0.1]:34503 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7jsi-0006Z1-Ix for submit@debbugs.gnu.org; Mon, 08 May 2017 10:43:24 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48553) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7jsg-0006Yo-HX for 26815@debbugs.gnu.org; Mon, 08 May 2017 10:43:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7jsY-0006Iq-8V for 26815@debbugs.gnu.org; Mon, 08 May 2017 10:43:17 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:52886) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7jsY-0006Ik-4T; Mon, 08 May 2017 10:43:14 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:57106 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d7jsX-0008EP-DA; Mon, 08 May 2017 10:43:13 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Marius Bakke Subject: Re: bug#26815: [PATCH 1/3] vm: Add support for arbitrary partition flags. References: <20170507143505.20724-1-mbakke@fastmail.com> <20170507143647.21036-1-mbakke@fastmail.com> Date: Mon, 08 May 2017 16:43:09 +0200 In-Reply-To: <20170507143647.21036-1-mbakke@fastmail.com> (Marius Bakke's message of "Sun, 7 May 2017 16:36:45 +0200") Message-ID: <87mvanl88y.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Hi Marius! Marius Bakke skribis: > * gnu/build/vm.scm (): Change BOOTABLE? to FLAGS. > (initialize-partition-table): Pass each flag to parted. > (initialize-hard-disk): Search for root partition by "boot" flag. > * gnu/system/vm.scm (qemu-image): Adjust partitions accordingly. [...] > + (apply append (map (lambda (flag) > + (cons* "set" (number->string index) > + (symbol->string flag) > + "on" '())) > + (partition-flags part))))) Use =E2=80=98append-map=E2=80=99 instead of (apply append (map =E2=80=A6)). OK with this change, thanks! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon May 08 10:45:40 2017 Received: (at 26815) by debbugs.gnu.org; 8 May 2017 14:45:40 +0000 Received: from localhost ([127.0.0.1]:34514 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7juu-0007Bd-9F for submit@debbugs.gnu.org; Mon, 08 May 2017 10:45:40 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49001) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7jut-00076h-GX for 26815@debbugs.gnu.org; Mon, 08 May 2017 10:45:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7jul-0007YT-7b for 26815@debbugs.gnu.org; Mon, 08 May 2017 10:45:34 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:52917) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7jul-0007YO-4R; Mon, 08 May 2017 10:45:31 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:57116 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d7juk-00005i-DE; Mon, 08 May 2017 10:45:30 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Danny Milosavljevic Subject: Re: bug#26815: [PATCH 2/3] vm: Support creating FAT partitions. References: <20170507143647.21036-1-mbakke@fastmail.com> <20170507143647.21036-2-mbakke@fastmail.com> <20170507172656.55edb3e9@scratchpost.org> <871ss0zmt0.fsf@fastmail.com> <20170507190637.0bf9c4ce@scratchpost.org> <87tw4wxyun.fsf@fastmail.com> <20170507220751.4d45ece0@scratchpost.org> Date: Mon, 08 May 2017 16:45:27 +0200 In-Reply-To: <20170507220751.4d45ece0@scratchpost.org> (Danny Milosavljevic's message of "Sun, 7 May 2017 22:07:51 +0200") Message-ID: <87inlbl854.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org, Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Danny Milosavljevic skribis: >>+(define* (format-partition partition type >>+ #:key label) >>+ "Create a file system TYPE on PARTITION. If LABEL is true, use that as the >>+volume name." >>+ (cond >>+ ((string-prefix? "ext" type) >>+ (create-ext-file-system partition type #:label label)) >>+ ((string-suffix? "fat" type) >>+ (create-fat-file-system partition #:label label)) >>+ (else (error "Unsupported file system.")))) > > ^^^ Indentation of the "else" is strange. > > Otherwise LGTM! Same here! Ludo'. From debbugs-submit-bounces@debbugs.gnu.org Mon May 08 10:51:02 2017 Received: (at 26815) by debbugs.gnu.org; 8 May 2017 14:51:02 +0000 Received: from localhost ([127.0.0.1]:34518 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7k05-00006y-SN for submit@debbugs.gnu.org; Mon, 08 May 2017 10:51:02 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50255) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7k02-00006b-Hj for 26815@debbugs.gnu.org; Mon, 08 May 2017 10:51:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7jzu-0000ke-N1 for 26815@debbugs.gnu.org; Mon, 08 May 2017 10:50:53 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:52969) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7jzu-0000kY-J6; Mon, 08 May 2017 10:50:50 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:57132 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d7jzt-0000nS-IT; Mon, 08 May 2017 10:50:50 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Marius Bakke Subject: Re: bug#26815: [PATCH 3/3] vm: Support EFI boot in base image. References: <20170507143647.21036-1-mbakke@fastmail.com> <20170507143647.21036-3-mbakke@fastmail.com> <20170507171814.555ec8b3@scratchpost.org> <87r300xyqq.fsf@fastmail.com> <87d1bjyay3.fsf@fastmail.com> Date: Mon, 08 May 2017 16:50:47 +0200 In-Reply-To: <87d1bjyay3.fsf@fastmail.com> (Marius Bakke's message of "Mon, 08 May 2017 11:06:28 +0200") Message-ID: <87efvzl7w8.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 26815 Cc: Danny Milosavljevic , 26815@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Marius Bakke skribis: > From 9555239cfc9362a15cc3f255040c410395d49e04 Mon Sep 17 00:00:00 2001 > From: Marius Bakke > Date: Sun, 7 May 2017 15:31:30 +0200 > Subject: [PATCH] vm: Support EFI boot in base image. > > * gnu/system/vm.scm (qemu-image): Add GRUB-EFI to inputs. Append 40MB > EFI System Partition. > * gnu/build/vm.scm (initialize-hard-disk): Generate grub EFI blob when ES= P is > present. [...] > + ;; If we have an ESP partition, generate a self-contained grub EFI > + ;; image and write it to a well-known location. > + (when esp > + (let* ((system %host-type) > + (efi-payload-directory (string-append efi-directory "/EFI/B= OOT")) > + ;; Map the grub targets to the boot file names expected by > + ;; UEFI compliant firmware. See "Removable Media Boot Behav= ior": > + ;; http://www.uefi.org/sites/default/files/resources/UEFI%2= 0Spec%202_6.pdf > + (efi-target-map (cond > + ((string-prefix? "x86_64" system) > + '("x86_64-efi" . "BOOTX64.EFI")) > + ((string-prefix? "i686" system) > + '("i386-efi" . "BOOTIA32.EFI")) > + ((string-prefix? "armhf" system) > + '("arm-efi" . "BOOTARM.EFI")) > + ((string-prefix? "aarch64" system) > + '("arm64-efi" . "BOOTAA64.EFI")))) > + (grub-tmp (string-append target "/tmp")) > + (grub.cfg (string-append grub-tmp "/grub.cfg"))) > + (display "mounting EFI system partition...\n") > + (mkdir-p efi-directory) > + (mount (partition-device esp) efi-directory > + (partition-file-system esp)) > + (mkdir-p efi-payload-directory) > + > + ;; Grub needs a tmpdir to prepare the image. > + (setenv "TMPDIR" grub-tmp) > + ;; We also need a tiny configuration file telling the EFI blob w= here > + ;; to find the real thing. > + (with-output-to-file grub.cfg > + (lambda _ > + (format #t > + "insmod part_msdos~@ > + search --set=3Droot --label gnu-disk-image~@ > + configfile /boot/grub/grub.cfg~%"))) > + (display "creating grub firmware image...\n") > + (unless (zero? (system* "grub-mkstandalone" "-O" (car efi-target= -map) > + "-o" (string-append efi-payload-director= y "/" > + (cdr efi-target-map)) > + ;; Graft the contents of our configurati= on file > + ;; into the image. See grub-mkstandalon= e(1). > + (string-append "boot/grub/grub.cfg=3D" g= rub.cfg))) > + (error "failed to create grub EFI image")) > + > + (delete-file grub.cfg) > + (umount efi-directory))) Could you move the body hi of =E2=80=98when=E2=80=99 to a separate procedur= e, say =E2=80=98install-efi=E2=80=99, such that this reduces to something like: (when esp (install-efi esp grub.cfg)) > + (partition > + ;; Append a small FAT32 partition f= or > + ;; use with UEFI bootloaders. > + (size (* 40 (expt 2 20))) > + (label "gnu-esp") > + (file-system "vfat") > + (flags '(esp)))))) > (initialize-hard-disk "/dev/vda" > #:partitions partitions > #:bootloader All the images we create will now have that extra ESP, but maybe that=E2=80= =99s OK. Is the =E2=80=9Cgnu-esp=E2=80=9D label of this partition used for lookup an= ywhere? If it was, we=E2=80=99d run into problems as soon as we have several partitions with this hard-coded label (say you have your installed GuixSD as well as the installation image on a USB key that=E2=80=99s plugged in.) If the = label is not used for lookup, that=E2=80=99s OK. Apart from that LGTM, thank you! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon May 08 11:56:09 2017 Received: (at 26815) by debbugs.gnu.org; 8 May 2017 15:56:09 +0000 Received: from localhost ([127.0.0.1]:34588 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7l17-0001fY-I5 for submit@debbugs.gnu.org; Mon, 08 May 2017 11:56:09 -0400 Received: from mail-pg0-f49.google.com ([74.125.83.49]:36164) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7l15-0001f7-77 for 26815@debbugs.gnu.org; Mon, 08 May 2017 11:56:07 -0400 Received: by mail-pg0-f49.google.com with SMTP id 64so13211053pgb.3 for <26815@debbugs.gnu.org>; Mon, 08 May 2017 08:56:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=FmHoSldOitUgwtEIglaPnbqrRIfVA6aKT/JGtGLdYyw=; b=ZvJoUh3GqegsLEXAdS2fDQwba7+DDpqo616DYYu84HGSDnCxZ7IxdTnX+qCtWjQ4un VacJam4CRcVmj3C7bEPIxwcTGeBzS2pdFsL2XJumEhvFrU21yhnZwBeP0AnChWOoK0MV JtJ0eCq2UKdjTLE1gkW1K3r0662SaSLxCQniPwO8+tA4kFroZTJj2LP/uGaqMfG4cdqR GwZQtPUSd1/uaNC+dV85zCsbH3CT/R8VQYKosQ1QhXe8E2NUvnAej9Q6svyjhjux+lw/ gKHZpgGU4JRI2QWz+JoDoruknR6LqdBIKPz12QWSIhV5J+AheW5HaqDtmv8y3GnO9i2i kQkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=FmHoSldOitUgwtEIglaPnbqrRIfVA6aKT/JGtGLdYyw=; b=dHs8ZHXUFt6xlo8+JNUEu2+F5YXXbGyzisDCR1QXdSy2RG5DIc+FlUAapvyg5H2CFd lcoCru8wNV1fV3X1jmSoKf7p3jfoCEPjz7vlsTFJu9ob7wgjSuv7/b4Wm1jmNg+HB3w8 XUtR5C6lNlb1uB0dZCX52YAyl6OfqNAZXvtrhpZGD2xvB9XaQ16A2FxffnfdKPHPJ8Ma SPG2bvZBw3UIim+R5h2QxVbvMJnK8t4FEuF/as7XC1WkgEoFZp7kaWKWZNYvYFXBy8E5 /3kvSo+RJhwbVw6ww4IKYphkBr8fWMLKpXnmUJGY+KJuuKGUm/4bG6P0SrIYNxsQwGaV /JCQ== X-Gm-Message-State: AN3rC/5TdePwOxSJNA5RFka8dbcSHUsklkrd/i3jmwIh4VlOhefFhXY6 WRaCNE0CMHvyrw== X-Received: by 10.99.113.69 with SMTP id b5mr19123910pgn.6.1494258961259; Mon, 08 May 2017 08:56:01 -0700 (PDT) Received: from apteryx (c-73-231-189-138.hsd1.ca.comcast.net. [73.231.189.138]) by smtp.gmail.com with ESMTPSA id z21sm19359865pgc.15.2017.05.08.08.56.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 May 2017 08:56:00 -0700 (PDT) From: Maxim Cournoyer To: Marius Bakke Subject: Re: bug#26815: [PATCH 1/3] vm: Add support for arbitrary partition flags. References: <20170507143505.20724-1-mbakke@fastmail.com> <20170507143647.21036-1-mbakke@fastmail.com> Date: Mon, 08 May 2017 08:55:56 -0700 In-Reply-To: <20170507143647.21036-1-mbakke@fastmail.com> (Marius Bakke's message of "Sun, 7 May 2017 16:36:45 +0200") Message-ID: <871srzz6k3.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello Marius, Marius Bakke writes: > * gnu/build/vm.scm (): Change BOOTABLE? to FLAGS. > (initialize-partition-table): Pass each flag to parted. > (initialize-hard-disk): Search for root partition by "boot" flag. > * gnu/system/vm.scm (qemu-image): Adjust partitions accordingly. > --- > gnu/build/vm.scm | 18 +++++++++++++----- > gnu/system/vm.scm | 2 +- > 2 files changed, 14 insertions(+), 6 deletions(-) > > diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm > index 440596a40..3286ffb02 100644 > --- a/gnu/build/vm.scm > +++ b/gnu/build/vm.scm > @@ -3,6 +3,7 @@ > ;;; Copyright =C2=A9 2016 Christopher Allan Webber > ;;; Copyright =C2=A9 2016 Leo Famulari > ;;; Copyright =C2=A9 2017 Mathieu Othacehe > +;;; Copyright =C2=A9 2017 Marius Bakke > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -41,7 +42,7 @@ > partition-size > partition-file-system > partition-label > - partition-bootable? > + partition-flags > partition-initializer >=20=20 > root-partition-initializer > @@ -141,7 +142,7 @@ the #:references-graphs parameter of 'derivation'." > (size partition-size) > (file-system partition-file-system (default "ext4")) > (label partition-label (default #f)) > - (bootable? partition-bootable? (default #f)) > + (flags partition-flags (default '())) > (initializer partition-initializer (default (const #t)))) >=20=20 > (define (fold2 proc seed1 seed2 lst) ;TODO: factorize > @@ -168,9 +169,11 @@ actual /dev name based on DEVICE." > (cons* "mkpart" "primary" "ext2" > (format #f "~aB" offset) > (format #f "~aB" (+ offset (partition-size part))) > - (if (partition-bootable? part) > - `("set" ,(number->string index) "boot" "on") > - '()))) > + (apply append (map (lambda (flag) I think you could replace the 'apply, append, map' by `map-append' here. > + (cons* "set" (number->string index) > + (symbol->string flag) > + "on" '())) > + (partition-flags part))))) Maxim --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEJ9WGpPiQCFQyn/CfEmDkZILmNWIFAlkQlQwACgkQEmDkZILm NWJNVA//X2Yq9D7UXxB0c1Ja/NeLS/x/Q5Q780Xg46jsr3GolA88FP/FkSyFzREB ooMcCtom3bTCKzxW/ZgMzx6TjwLksXGGY7NOvZ8ULQwrvFD2L5sDGbUSexEF+auj 5ypAZDtwMwztGRjBP1KrhHjhE964g2leEI14xWoSlnq+64/YQNE7pj1oVTC40k1S A+nmVnb3AaPuqNVqCprlmxq824CzD0w+F/DLZIZmOUXhP28I7e2p/wXyOVfGDhhL Itl90U5LFc77rkif/3G9rPoHOrBDJHiQQTwJAcx7EEHaf5P4l21uP20eitj6on2R peEwlO5/IKv9kf6dev4pjLwdKgiu0SK1kJ+/gf1u1O4Nq0YHDBsaNoDdvwcTaQQ9 26O6+/vjFeZgiToqpLKpHwiIUsoHbWLaiAq3A04FLi+LFCp9632EoPqW1OVBxwvJ 92tS0KLEMlm3gd4z5KprHq3MVz6LIWkbqezgjUrGg+bV39HxoVkJ+68PHg0lU/6F 1nmMC21JBwCjBHPwIYrXA04jn0hqtmHvJis9/pEY+3VNTgWvHAqnI013m7fDE7Tl lMiGk51TveYNCSJuAyUWdoDHSaARAYhPUiQ1frmHPe34xDaqHJ9PlF7koaKnZdqB loftvigWSvfMRP4rfhZGLIyqQ+o0TMBzVUWgH8tG70XpuJyIl6c= =YswM -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon May 08 11:59:33 2017 Received: (at 26815) by debbugs.gnu.org; 8 May 2017 15:59:33 +0000 Received: from localhost ([127.0.0.1]:34592 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7l4P-0001k0-1r for submit@debbugs.gnu.org; Mon, 08 May 2017 11:59:33 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:36646) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7l4N-0001jo-Uy for 26815@debbugs.gnu.org; Mon, 08 May 2017 11:59:32 -0400 Received: by mail-pg0-f65.google.com with SMTP id 64so3632396pgb.3 for <26815@debbugs.gnu.org>; Mon, 08 May 2017 08:59:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=yiVaJtmvmVEo/MOpU2fHtru1RL9fQIblf5I2zwGao/o=; b=Wsl6BE56Q0qX5x9cfDuuJkdMbiM2+GsXKitE7NVO747rE6AtnVq7BLrJDmdfnbOFsr T2d1XdR6FAsGGV1WKdYBPA0FpTuM5clpgItdFzgIFys9AwZZez4BpZ3A85L3RJuseAaI 6cKK++BdNWHxubi4I6xJHhXN3ASW7wGPbupOTVg0w+x2mg9jx65thXeGb76lEKzY/itj uE8j7ledZKzwu3iaGqO3QnERvBDLcZJYMUr5kglcYrWdyx6rpzmkZcC8el/CZXrj+Q4n dv52JR367inKQVcoHc3H+F7/IuaHl5sarUslQgg5tBd1WG70LcF5pqxr8z7LpSSEbvt1 rhmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=yiVaJtmvmVEo/MOpU2fHtru1RL9fQIblf5I2zwGao/o=; b=N105fkcz0KJEtfBr+u2mcoEZIwxwj7tK4tD1TgOjWUdksquwpRgDLtsLhjaVxTvLPX iX2L1RAt6Q/6LDn8eoZO/3GvaAR2aoskkp4VKEnoYYUgXwaAOw83KrDUUnmwpLGAneC8 O7gQajGVBA6s5Au9Lyg4u6WyolRr1JIXD+A+YeTASw2/H4rTORp0rVLksNcA552+JnUr HK5VxX7Qs81E0H1BvdCWQ01J/F/UpXUtDB5ZYZS8r1x1BAtgklfeRwDCyNKtkvasIeH0 nSCJQLXBtMNHWWlpqxyS9PMFfodiQRA/pDlR0rodALcrsIXRiuka0Dfn+8VMjk9wekf7 K1mg== X-Gm-Message-State: AN3rC/4MfVVAeNWQ4Xv9k4RxRPkkLkITXXkooy9iPdxXpQkm4sGH46Vp qGmel41/QvSjER9U X-Received: by 10.99.172.84 with SMTP id z20mr19464060pgn.12.1494259166117; Mon, 08 May 2017 08:59:26 -0700 (PDT) Received: from apteryx (c-73-231-189-138.hsd1.ca.comcast.net. [73.231.189.138]) by smtp.gmail.com with ESMTPSA id d3sm29510618pfg.30.2017.05.08.08.59.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 May 2017 08:59:25 -0700 (PDT) From: Maxim Cournoyer To: Marius Bakke Subject: Re: bug#26815: [PATCH 2/3] vm: Support creating FAT partitions. References: <20170507143647.21036-1-mbakke@fastmail.com> <20170507143647.21036-2-mbakke@fastmail.com> Date: Mon, 08 May 2017 08:59:24 -0700 In-Reply-To: <20170507143647.21036-2-mbakke@fastmail.com> (Marius Bakke's message of "Sun, 7 May 2017 16:36:46 +0200") Message-ID: <87wp9rxrtv.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Hi, Marius Bakke writes: > * gnu/build/vm.scm (create-ext-file-system, create-fat-file-system): New procedures. > (format-partition): Use procedures. Error for unknown file systems. > * gnu/system/vm.scm (qemu-image): Add DOSFSTOOLS to the closure. > * gnu/system/linux-initrd.scm (base-initrd): Add nls_is8859-1.ko regardless of > whether a FAT filesystem is present. > --- > gnu/build/vm.scm | 43 ++++++++++++++++++++++++++++++++++++------- > gnu/system/linux-initrd.scm | 4 +--- > gnu/system/vm.scm | 2 +- > 3 files changed, 38 insertions(+), 11 deletions(-) > > diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm > index 3286ffb02..ad39e29ce 100644 > --- a/gnu/build/vm.scm > +++ b/gnu/build/vm.scm > @@ -214,17 +214,46 @@ actual /dev name based on DEVICE." > > (define MS_BIND 4096) ; again! > > +(define* (create-ext-file-system partition type > + #:key label) > + "Create an ext-family filesystem of TYPE on PARTITION. If LABEL is true, > +use that as the volume name." > + (format #t "creating ~a partition...\n" type) > + (apply system* (string-append "mkfs." type) Is there a reason why we don't simply call system* directly here? And similarly below. I don't see the gain of using `apply'. Maybe I'm missing something. > + "-F" partition > + (if label > + `("-L" ,label) > + '()))) > + > +(define* (create-fat32-file-system partition > + #:key label) > + "Create a FAT32 filesystem on PARTITION, which must be at least 32 MiB long. > +If LABEL is true, use that as volume name." > + (format #t "Creating FAT32 partition...\n") > + ;; Without the -F parameter, mkfs.fat will automatically determine > + ;; the number of file allocation tables based on partition size. > + ;; Ensure a FAT32 partition for compatibility with e.g. UEFI. > + (apply system* "mkfs.fat" "-F32" partition > + (if label > + `("-n" ,label) > + '()))) > + Maxim From debbugs-submit-bounces@debbugs.gnu.org Mon May 08 17:41:23 2017 Received: (at 26815) by debbugs.gnu.org; 8 May 2017 21:41:23 +0000 Received: from localhost ([127.0.0.1]:60356 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7qPD-0001Df-8F for submit@debbugs.gnu.org; Mon, 08 May 2017 17:41:23 -0400 Received: from dd1012.kasserver.com ([85.13.128.8]:42704) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7qPB-0001DW-NJ for 26815@debbugs.gnu.org; Mon, 08 May 2017 17:41:22 -0400 Received: from localhost (77.118.221.44.wireless.dyn.drei.com [77.118.221.44]) by dd1012.kasserver.com (Postfix) with ESMTPSA id E11491CA066C; Mon, 8 May 2017 23:41:19 +0200 (CEST) Date: Mon, 8 May 2017 23:41:16 +0200 From: Danny Milosavljevic To: Marius Bakke Subject: Re: bug#26815: [PATCH 1/3] vm: Add support for arbitrary partition flags. Message-ID: <20170508234116.2d95f4ba@scratchpost.org> In-Reply-To: <20170507143647.21036-1-mbakke@fastmail.com> References: <20170507143505.20724-1-mbakke@fastmail.com> <20170507143647.21036-1-mbakke@fastmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) > + (define (partition-bootable? partitions) Why the plural? > + "Return the first partition found with the boot flag set." It's only one, right? Otherwise LGTM! From debbugs-submit-bounces@debbugs.gnu.org Wed May 10 15:52:43 2017 Received: (at 26815) by debbugs.gnu.org; 10 May 2017 19:52:44 +0000 Received: from localhost ([127.0.0.1]:37134 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8Xf8-0004Jl-NO for submit@debbugs.gnu.org; Wed, 10 May 2017 15:52:43 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:42971) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8Xf5-0004JZ-1B for 26815@debbugs.gnu.org; Wed, 10 May 2017 15:52:40 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 6CA91208E8; Wed, 10 May 2017 15:52:38 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Wed, 10 May 2017 15:52:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=QJaLtt3EO1V05ALCKY BWSY6EuFM6Y4k2xaDjcP+2lL4=; b=m8dE+u0vKfTE4Vr2RlFeGMLnhSV+0y8WL2 na71i9JzeA85izKZ+kNOXiWJUOKGztkV/+NOWQMSb9ffGWAu4IHKJF0OgcSXRqwd wdeQ6WMYBtd0t1u3NHO2XmjfxwwPb7LCalObdIJ/jZ0HzJ84/0M1ZZt6J5pf3JBL dOi1gHdoV/uatVufHaG8LQy9Z7RCUMku31nrR+UtdAkADMyCKTrMx+oHOKMPBtuf 7IQIizvMq6B8ARLIT1jNAe0WhKZjAC0vk9Qih89ffvFlsDjp+AMj8noQsyV9rBhY Yq9e8qwrgAGq8QeHnDhcbgY8kGFPJPoTCnXU5ENNosH1oE3rSWaQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s= fm1; bh=QJaLtt3EO1V05ALCKYBWSY6EuFM6Y4k2xaDjcP+2lL4=; b=AJTvVrIx +beRz3/iz1yDZFGSU03Zpreq5zYKj1ODncu4abe+ZFWTLD0yI7R6xdTMUeFXaN48 20dvXjhghcYQENvBFTixC6pB5cFLXvcMoRs3CMtjjT1nihe6WiA8HR+agZxtcVKO QtRzzfmG0vyfObC8Rxw33gc0QBIAeHLHIgD8SPrGWwLil5DqgWL4p/c7EWLZiYCS WSYGkGCByRD/YbFfxB+UePL6F0Io3tnB1rknOxXtbIgDA3Y/8vq3Z4wfo91jltlr TJhd626nqWgXawZQAhrKkUV4y28TvAjFxELYWpTSe8jspgFTWC5Gw78YbkqZ74Wq +kdG9xzSEs1HyQ== X-ME-Sender: X-Sasl-enc: JHFwxNrVRwBnjHLdwH9RzjJmm4MvlWT5clETCAWff3Y5 1494445957 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id E57397E8D4; Wed, 10 May 2017 15:52:37 -0400 (EDT) From: Marius Bakke To: 26815@debbugs.gnu.org Subject: [PATCH 1/3] vm: Support arbitrary partition flags. Date: Wed, 10 May 2017 21:52:25 +0200 Message-Id: <20170510195227.13461-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <87efvzl7w8.fsf@gnu.org> References: <87efvzl7w8.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/build/vm.scm (): Change BOOTABLE? to FLAGS. (initialize-partition-table): Pass each flag to parted. (initialize-hard-disk): Locate boot partition. * gnu/system/vm.scm (qemu-image): Adjust partition flags. --- gnu/build/vm.scm | 17 ++++++++++++----- gnu/system/vm.scm | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 440596a40..588b2d58b 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,7 +42,7 @@ partition-size partition-file-system partition-label - partition-bootable? + partition-flags partition-initializer root-partition-initializer @@ -141,7 +142,7 @@ the #:references-graphs parameter of 'derivation'." (size partition-size) (file-system partition-file-system (default "ext4")) (label partition-label (default #f)) - (bootable? partition-bootable? (default #f)) + (flags partition-flags (default '())) (initializer partition-initializer (default (const #t)))) (define (fold2 proc seed1 seed2 lst) ;TODO: factorize @@ -168,9 +169,10 @@ actual /dev name based on DEVICE." (cons* "mkpart" "primary" "ext2" (format #f "~aB" offset) (format #f "~aB" (+ offset (partition-size part))) - (if (partition-bootable? part) - `("set" ,(number->string index) "boot" "on") - '()))) + (append-map (lambda (flag) + (list "set" (number->string index) + (symbol->string flag) "on")) + (partition-flags part)))) (define (options partitions offset) (let loop ((partitions partitions) @@ -303,6 +305,11 @@ in PARTITIONS, and using BOOTCFG as its bootloader configuration file. Each partition is initialized by calling its 'initializer' procedure, passing it a directory name where it is mounted." + + (define (partition-bootable? partition) + "Return the first partition found with the boot flag set." + (member 'boot (partition-flags partition))) + (let* ((partitions (initialize-partition-table device partitions)) (root (find partition-bootable? partitions)) (target "/fs")) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index cc13abe2a..42c7690b1 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -230,7 +230,7 @@ the image." (* 10 (expt 2 20)))) (label #$file-system-label) (file-system #$file-system-type) - (bootable? #t) + (flags '(boot)) (initializer initialize))))) (initialize-hard-disk "/dev/vda" #:partitions partitions -- 2.12.2 From debbugs-submit-bounces@debbugs.gnu.org Wed May 10 15:52:47 2017 Received: (at 26815) by debbugs.gnu.org; 10 May 2017 19:52:47 +0000 Received: from localhost ([127.0.0.1]:37139 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8XfC-0004K2-VC for submit@debbugs.gnu.org; Wed, 10 May 2017 15:52:47 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:56283) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8XfB-0004Jv-Q9 for 26815@debbugs.gnu.org; Wed, 10 May 2017 15:52:46 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 8E3CA20AF7; Wed, 10 May 2017 15:52:45 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Wed, 10 May 2017 15:52:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=NFBpNr RWxiw29/0+N9Mt4s2eoX8RBKYKx7EhI2qofaY=; b=hP1I0yTkAv0ZNPkuNhQqyu cB4uaRizp2DG1vGYI7GqRAOnMLmeYQ8j0RI1SXDl/mJOe0BYqjstLTPUjlW6DIjS R2H4PLXMNBUZS3r9Fdrqh2H4Wgpev+ezQTkCrWpPFShfOQU8EGoEcYZToCR2TopC hAEHu+Qy45qcS1EssB0lJiaEJ7dZapYA1H9SuPKTZROuc+pJccggOntYtJRPYvCs KRZrkn2hgjmUcn8kLpJO6alOA6hVJEMgDSYoqIh+dc6B9QVslbw2Mut4ZNmpXy1Z CWqs9dFdXeiqCdHQSGRx72VA7TdyFWW5PKGsoMNiLyWIuTEZ4z7KAGWH7Lxc1XZw == DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=NFBpNrRWxiw29/0+N9Mt4s2eoX8RBKYKx7EhI2qof aY=; b=IR2lP29FHviKeb2wCJXlVa0OaCnKDAlpdbAQGbi9XbFt93e+8wPhWTqph oJv4oUjzQvHkpENJBV+eqxKRI+IowZnfXzHr4GljRg/ZoCsQmRaUDqIcPNvZtB9j cy5QFu66zZvT72V2woCGzITFqJ5j9cP5HhNYDg2gKeCQ3fWaozAXdgS4xnAa6sce Ia9hqhaAthfGwS/maoyweESpbGPoJ7wNEp8UyAy0LCSh1IRXPVlN6zxBWWrGk73p afNklui93GjFe5ZqBvUoxeNBwR8bJLvCqr1ojg8FJ0LZJCYeqj2BY8eDA0XalNQ8 zfDFtdueTzorcgb8YZTpRQQgfvIjw== X-ME-Sender: X-Sasl-enc: 5o2Xxvy5YEtAMUTDOaxhM23LTX+XBK/4xcCBCCMDYw3p 1494445965 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 1DAF47E9E6; Wed, 10 May 2017 15:52:45 -0400 (EDT) From: Marius Bakke To: 26815@debbugs.gnu.org Subject: [PATCH 2/3] vm: Support creating FAT partitions. Date: Wed, 10 May 2017 21:52:26 +0200 Message-Id: <20170510195227.13461-2-mbakke@fastmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170510195227.13461-1-mbakke@fastmail.com> References: <87efvzl7w8.fsf@gnu.org> <20170510195227.13461-1-mbakke@fastmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/build/vm.scm (create-ext-file-system, create-fat-file-system): New procedures. (format-partition): Use them. Error for unknown file systems. * gnu/system/vm.scm (qemu-image): Include DOSFSTOOLS. * gnu/system/linux-initrd.scm (base-initrd): Always add nls_is8859-1.ko. --- gnu/build/vm.scm | 30 ++++++++++++++++++++++++++---- gnu/system/linux-initrd.scm | 4 +--- gnu/system/vm.scm | 2 +- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 588b2d58b..935a174fc 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -213,10 +213,10 @@ actual /dev name based on DEVICE." (define MS_BIND 4096) ; again! -(define* (format-partition partition type - #:key label) - "Create a file system TYPE on PARTITION. If LABEL is true, use that as the -volume name." +(define* (create-ext-file-system partition type + #:key label) + "Create an ext-family filesystem of TYPE on PARTITION. If LABEL is true, +use that as the volume name." (format #t "creating ~a partition...\n" type) (unless (zero? (apply system* (string-append "mkfs." type) "-F" partition @@ -225,6 +225,28 @@ volume name." '()))) (error "failed to create partition"))) +(define* (create-fat-file-system partition + #:key label) + "Create a FAT filesystem on PARTITION. The number of File Allocation Tables +will be determined based on filesystem size. If LABEL is true, use that as the +volume name." + (format #t "creating FAT partition...\n") + (unless (zero? (apply system* "mkfs.fat" partition + (if label + `("-n" ,label) + '()))) + (error "failed to create FAT partition"))) + +(define* (format-partition partition type + #:key label) + "Create a file system TYPE on PARTITION. If LABEL is true, use that as the +volume name." + (cond ((string-prefix? "ext" type) + (create-ext-file-system partition type #:label label)) + ((or (string-prefix? "fat" type) (string= "vfat" type)) + (create-fat-file-system partition #:label label)) + (else (error "Unsupported file system.")))) + (define (initialize-partition partition) "Format PARTITION, a object with a non-#f 'device' field, mount it, run its initializer, and unmount it." diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index dfe198e43..3a5e76034 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -268,6 +268,7 @@ loaded at boot time in the order in which they appear." "usbhid" "hid-generic" "hid-apple" ;keyboards during early boot "dm-crypt" "xts" "serpent_generic" "wp512" ;for encrypted root partitions "nvme" ;for new SSD NVMe devices + "nls_iso8859-1" ;for `mkfs.fat`, et.al ,@(if (string-match "^(x86_64|i[3-6]86)-" (%current-system)) '("pata_acpi" "pata_atiixp" ;for ATA controllers "isci") ;for SAS controllers like Intel C602 @@ -281,9 +282,6 @@ loaded at boot time in the order in which they appear." ,@(if (find (file-system-type-predicate "9p") file-systems) virtio-9p-modules '()) - ,@(if (find (file-system-type-predicate "vfat") file-systems) - '("nls_iso8859-1") - '()) ,@(if (find (file-system-type-predicate "btrfs") file-systems) '("btrfs") '()) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 42c7690b1..099e3fac3 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -202,7 +202,7 @@ the image." (guix build utils)) (let ((inputs - '#$(append (list qemu parted e2fsprogs) + '#$(append (list qemu parted e2fsprogs dosfstools) (map canonical-package (list sed grep coreutils findutils gawk)) (if register-closures? (list guix) '()))) -- 2.12.2 From debbugs-submit-bounces@debbugs.gnu.org Wed May 10 15:52:50 2017 Received: (at 26815) by debbugs.gnu.org; 10 May 2017 19:52:50 +0000 Received: from localhost ([127.0.0.1]:37144 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8XfG-0004KI-8B for submit@debbugs.gnu.org; Wed, 10 May 2017 15:52:50 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:36547) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8XfE-0004KA-KC for 26815@debbugs.gnu.org; Wed, 10 May 2017 15:52:49 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 588EB20A32; Wed, 10 May 2017 15:52:48 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Wed, 10 May 2017 15:52:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=APxsPyyNxiGiu/xE1w 2ebtLM9+Bac6JNJQWmvadNTfo=; b=e2S993eywEzEh99/m24ByGalLtslabM8MK wU/+3ggpmk7LrWLb6SYlTI9w/ULEEX3kbWlFcW+DtYyzVjYJ0idA/0cQ8xZEZkfW zH3HhXkstYA1hG0T8tJW4HMuq8pkOfSJrpj+MdliaZn3HjfZAYsXrv7TfkgncHMw +q5678VFiwgsXTHZNvsnsgyN7ZoYgVmRASfW6XyclyZV5z+OJNx2rnvnZoHslfpA f2PkJlRO92AOgb6MFyVkgi2p3Wc3vLMa5RmTRJKJ/BN2KYob60fgoLCVZH3Ra8Zn FHE8HKf3KS95aqc7xLgfRmt6TNldl81TozWuNNRSBSWjX0Fk7c1w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s= fm1; bh=APxsPyyNxiGiu/xE1w2ebtLM9+Bac6JNJQWmvadNTfo=; b=JKmL696v sNFkpGa/hI8vemsXj/PMlExHapFQkfO5c8rjHKZpj9MWj686y+iCAaMnjtlLtZrB O4rmdaS9zXNR7ZBCTDEyZYur74qGv5uNpd5EocOspjPuDtrg4MdBPRjtiG6JjyKn SKFmu9PLtBiK/rqso2WMDGk6MnJe4EzRN/mlrJ17aXOTaMbJxsIWoQV7zbsFf93X q1aC9SrUSknldwtc1D66CP6NKPXYs8en1pZz9bsS2Q8BMfvo375Ds7U6cBvag7N4 gwSr2o16azqkTVlMeqFrjuMtPI+EsILN46AV15H1YNhK3djNdsDbQa5NkH3m+Loq ib5j41HQDHj41A== X-ME-Sender: X-Sasl-enc: 3e/kG0+UmMIwRHrKAzC31YsczzvRstDyzjTyfPuadVMn 1494445967 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id A81BE7E962; Wed, 10 May 2017 15:52:47 -0400 (EDT) From: Marius Bakke To: 26815@debbugs.gnu.org Subject: [PATCH 3/3] vm: Add UEFI loader to disk images. Date: Wed, 10 May 2017 21:52:27 +0200 Message-Id: <20170510195227.13461-3-mbakke@fastmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170510195227.13461-1-mbakke@fastmail.com> References: <87efvzl7w8.fsf@gnu.org> <20170510195227.13461-1-mbakke@fastmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/system/vm.scm (qemu-image): Add GRUB-EFI to inputs. Append 40MiB EFI System Partition. * gnu/build/vm.scm (install-efi): New procedure. (initialize-hard-disk): Generate grub EFI blob when ESP is present. --- gnu/build/vm.scm | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ gnu/system/vm.scm | 19 +++++++++++++++--- 2 files changed, 76 insertions(+), 3 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 935a174fc..258c0b8ae 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -27,6 +27,7 @@ #:use-module (gnu build linux-boot) #:use-module (gnu build install) #:use-module (guix records) + #:use-module (ice-9 format) #:use-module (ice-9 match) #:use-module (ice-9 regex) #:use-module (srfi srfi-1) @@ -315,6 +316,34 @@ SYSTEM-DIRECTORY is the name of the directory of the 'system' derivation." (mkdir-p directory) (symlink bootcfg (string-append directory "/bootcfg")))) +(define (install-efi esp grub.cfg) + "Write a self-contained Grub UEFI blob to the mounted ESP using GRUB.CFG." + (let* ((system %host-type) + ;; Hard code the output location to a well-known path recognized by + ;; compliant firmware. See "3.5.1.1 Removable Media Boot Behaviour": + ;; http://www.uefi.org/sites/default/files/resources/UEFI%20Spec%202_6.pdf + (efi-directory (string-append esp "/EFI/BOOT")) + ;; Map grub target names to boot file names. + (efi-target-map (cond + ((string-prefix? "x86_64" system) + '("x86_64-efi" . "BOOTX64.EFI")) + ((string-prefix? "i686" system) + '("i386-efi" . "BOOTIA32.EFI")) + ((string-prefix? "armhf" system) + '("arm-efi" . "BOOTARM.EFI")) + ((string-prefix? "aarch64" system) + '("arm64-efi" . "BOOTAA64.EFI"))))) + ;; Grub needs a TMPDIR to prepare the firmware image. + (setenv "TMPDIR" esp) + + (mkdir-p efi-directory) + (unless (zero? (system* "grub-mkstandalone" "-O" (car efi-target-map) + "-o" (string-append efi-directory "/" + (cdr efi-target-map)) + ;; Graft the configuration file onto the image. + (string-append "boot/grub/grub.cfg=" grub.cfg))) + (error "failed to create grub EFI image")))) + (define* (initialize-hard-disk device #:key bootloader @@ -332,8 +361,13 @@ passing it a directory name where it is mounted." "Return the first partition found with the boot flag set." (member 'boot (partition-flags partition))) + (define (partition-esp? partition) + "Return the first EFI System Partition." + (member 'esp (partition-flags partition))) + (let* ((partitions (initialize-partition-table device partitions)) (root (find partition-bootable? partitions)) + (esp (find partition-esp? partitions)) (target "/fs")) (unless root (error "no bootable partition specified" partitions)) @@ -345,8 +379,34 @@ passing it a directory name where it is mounted." (mount (partition-device root) target (partition-file-system root)) (install-boot-config bootcfg bootcfg-location target) (when bootloader-installer + (display "installing bootloader...\n") (bootloader-installer bootloader device target)) + (when esp + ;; Mount the ESP somewhere and install Grub UEFI image. + (let ((mount-point (string-append target "/boot/efi")) + (grub.cfg (string-append target "/tmp/grub-standalone.cfg"))) + (display "mounting EFI system partition...\n") + (mkdir-p mount-point) + (mount (partition-device esp) mount-point + (partition-file-system esp)) + + ;; Create a tiny configuration file telling the embedded grub + ;; where to load the real thing. + (with-output-to-file grub.cfg + (lambda _ + (format #t + "insmod part_msdos~@ + search --set=root --label gnu-disk-image~@ + configfile /boot/grub/grub.cfg~%"))) + + (display "creating EFI firmware image...") + (install-efi mount-point grub.cfg) + (display "done.\n") + + (delete-file grub.cfg) + (umount mount-point))) + ;; Register BOOTCFG as a GC root. (register-bootcfg-root target bootcfg) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 099e3fac3..fbabcf6c3 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -202,7 +203,7 @@ the image." (guix build utils)) (let ((inputs - '#$(append (list qemu parted e2fsprogs dosfstools) + '#$(append (list qemu parted e2fsprogs dosfstools grub-efi) (map canonical-package (list sed grep coreutils findutils gawk)) (if register-closures? (list guix) '()))) @@ -227,11 +228,23 @@ the image." #:system-directory #$os.drv)) (partitions (list (partition (size #$(- disk-image-size - (* 10 (expt 2 20)))) + (* 50 (expt 2 20)))) (label #$file-system-label) (file-system #$file-system-type) (flags '(boot)) - (initializer initialize))))) + (initializer initialize)) + ;; Append a small EFI System Partition for + ;; use with UEFI bootloaders. + (partition + ;; The standalone grub image is about 10MiB, but + ;; leave some room for custom or multiple images. + (size (* 40 (expt 2 20))) + (label "GNU-ESP") ;cosmetic only + ;; Use "vfat" here since this property is used + ;; when mounting. The actual FAT-ness is based + ;; on filesystem size (16 in this case). + (file-system "vfat") + (flags '(esp)))))) (initialize-hard-disk "/dev/vda" #:partitions partitions #:bootloader -- 2.12.2 From debbugs-submit-bounces@debbugs.gnu.org Wed May 10 15:59:01 2017 Received: (at 26815) by debbugs.gnu.org; 10 May 2017 19:59:01 +0000 Received: from localhost ([127.0.0.1]:37152 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8XlF-0004SR-4a for submit@debbugs.gnu.org; Wed, 10 May 2017 15:59:01 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:38461) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8XlD-0004SJ-Ee for 26815@debbugs.gnu.org; Wed, 10 May 2017 15:58:59 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 159B6209EE; Wed, 10 May 2017 15:58:59 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Wed, 10 May 2017 15:58:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=fP7A49x7sw2hBPDtZj3DAW2gc14m/ADNPwDbXNFKw +8=; b=motzPnJ5XJun8/7NnumQIhyZtpO1vI1vkvSDRZD/ODk+//yedAcZGxFig 2zguFMJSNZkpPQH9B2ES8qOWq3XF1MPOT2VurwayHobkkhiwdLkbDUSukHj0XqDl mnlBEqK7h8apcAKe0d5lT+l5L5B0bna+iIIepBAkeAXRIelRVdlrnHbykFpQDG10 ZqzGlWP8IznzUQNnnq7TK/I7HxcAdXzj2CujwpPBI6Q4h/Ze0tAaveAb7JAKD/X4 zjx9ParW6ivxOI1FehQpYNhR7kYCLKhhkPdQl4l8as0s0pm9Ny06H6rJgCLyUJXt lJkkB+J+5YF+27xf7mrpwJAP9B5nQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=fP7A49x7sw2hBPDtZj 3DAW2gc14m/ADNPwDbXNFKw+8=; b=cYIscJWBlUTXqlVXpAkPhFnAkNk6NBHHGg lF+APbv+AwQSkuyWEbBHmyBReeZJyS77s7JbPb/5AQPcov8xViGFrKrSW3T/pQdl MgQdbmcDNgP6N5485tdH0Kf6wfnWrrqpdGmR9JAuJFqOrjJEoP6LPyzfddO2FJ2b E04fnIdcbS7Ot6SDud3Jn2x8cBwFryqqmamC4DOz6qrURkezJfXJbyao+82ml2lN MQ5E2+kXlTOgzg+PWUualsSYsGpcdK0bscYTYlFRPEFCK8VopRuLM88w+zm1BoQ8 AVmN7iugVqnFYTT5TmRJ/ysXR4/f2ociHS7NHIK+Mb3rwubhvtDg== X-ME-Sender: X-Sasl-enc: ushWFIsOIzCZYPltBK+ctdHAkX9n989FP279PylWUJUZ 1494446338 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 98DCE7E98A; Wed, 10 May 2017 15:58:58 -0400 (EDT) From: Marius Bakke To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#26815: [PATCH 3/3] vm: Support EFI boot in base image. In-Reply-To: <87efvzl7w8.fsf@gnu.org> References: <20170507143647.21036-1-mbakke@fastmail.com> <20170507143647.21036-3-mbakke@fastmail.com> <20170507171814.555ec8b3@scratchpost.org> <87r300xyqq.fsf@fastmail.com> <87d1bjyay3.fsf@fastmail.com> <87efvzl7w8.fsf@gnu.org> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Wed, 10 May 2017 21:58:56 +0200 Message-ID: <87inl8lbzz.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 26815 Cc: Danny Milosavljevic , 26815@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Marius Bakke skribis: > >> From 9555239cfc9362a15cc3f255040c410395d49e04 Mon Sep 17 00:00:00 2001 >> From: Marius Bakke >> Date: Sun, 7 May 2017 15:31:30 +0200 >> Subject: [PATCH] vm: Support EFI boot in base image. >> >> * gnu/system/vm.scm (qemu-image): Add GRUB-EFI to inputs. Append 40MB >> EFI System Partition. >> * gnu/build/vm.scm (initialize-hard-disk): Generate grub EFI blob when E= SP is >> present. > > [...] > >> + ;; If we have an ESP partition, generate a self-contained grub EFI >> + ;; image and write it to a well-known location. >> + (when esp >> + (let* ((system %host-type) >> + (efi-payload-directory (string-append efi-directory "/EFI/= BOOT")) >> + ;; Map the grub targets to the boot file names expected by >> + ;; UEFI compliant firmware. See "Removable Media Boot Beha= vior": >> + ;; http://www.uefi.org/sites/default/files/resources/UEFI%= 20Spec%202_6.pdf >> + (efi-target-map (cond >> + ((string-prefix? "x86_64" system) >> + '("x86_64-efi" . "BOOTX64.EFI")) >> + ((string-prefix? "i686" system) >> + '("i386-efi" . "BOOTIA32.EFI")) >> + ((string-prefix? "armhf" system) >> + '("arm-efi" . "BOOTARM.EFI")) >> + ((string-prefix? "aarch64" system) >> + '("arm64-efi" . "BOOTAA64.EFI")))) >> + (grub-tmp (string-append target "/tmp")) >> + (grub.cfg (string-append grub-tmp "/grub.cfg"))) >> + (display "mounting EFI system partition...\n") >> + (mkdir-p efi-directory) >> + (mount (partition-device esp) efi-directory >> + (partition-file-system esp)) >> + (mkdir-p efi-payload-directory) >> + >> + ;; Grub needs a tmpdir to prepare the image. >> + (setenv "TMPDIR" grub-tmp) >> + ;; We also need a tiny configuration file telling the EFI blob = where >> + ;; to find the real thing. >> + (with-output-to-file grub.cfg >> + (lambda _ >> + (format #t >> + "insmod part_msdos~@ >> + search --set=3Droot --label gnu-disk-image~@ >> + configfile /boot/grub/grub.cfg~%"))) >> + (display "creating grub firmware image...\n") >> + (unless (zero? (system* "grub-mkstandalone" "-O" (car efi-targe= t-map) >> + "-o" (string-append efi-payload-directo= ry "/" >> + (cdr efi-target-map= )) >> + ;; Graft the contents of our configurat= ion file >> + ;; into the image. See grub-mkstandalo= ne(1). >> + (string-append "boot/grub/grub.cfg=3D" = grub.cfg))) >> + (error "failed to create grub EFI image")) >> + >> + (delete-file grub.cfg) >> + (umount efi-directory))) > > Could you move the body hi of =E2=80=98when=E2=80=99 to a separate proced= ure, say > =E2=80=98install-efi=E2=80=99, such that this reduces to something like: > > (when esp > (install-efi esp grub.cfg)) Good idea. I've moved the grub parts into a separate procedure, but kept the mounting etc here. >> + (partition >> + ;; Append a small FAT32 partition = for >> + ;; use with UEFI bootloaders. >> + (size (* 40 (expt 2 20))) >> + (label "gnu-esp") >> + (file-system "vfat") >> + (flags '(esp)))))) >> (initialize-hard-disk "/dev/vda" >> #:partitions partitions >> #:bootloader > > All the images we create will now have that extra ESP, but maybe that=E2= =80=99s > OK. It's "only" 40MiB, so didn't see a reason to complicate it. Grub is actually just ~10MiB, but left some space for..stuff? There are some rare systems with 32-bit UEFI and 64-bit CPU, those users should be able to copy "BOOTIA32.EFI" from an i686 image onto the ESP. > Is the =E2=80=9Cgnu-esp=E2=80=9D label of this partition used for lookup = anywhere? If > it was, we=E2=80=99d run into problems as soon as we have several partiti= ons > with this hard-coded label (say you have your installed GuixSD as well > as the installation image on a USB key that=E2=80=99s plugged in.) If th= e label > is not used for lookup, that=E2=80=99s OK. It's only used for informational purposes. Now even uppercase to display properly on ancient systems :-P I've sent a new patch series taking the reviews into account. The patches from id:20170506154154.17836-1-m.othacehe@gmail.com are still required. (Also, --size=3D1G is no longer enough after the Guile 2.2 transition!) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkTcQEACgkQoqBt8qM6 VPo9kwf/VDDYYgglFnAMkThrGRvJaHaUb6ztLN6w9icsfmCp4Y6ZaUunCvoR1Uo7 4mdOHw8+mDg4TXOXZknPpP4gISyotbcz2o9v3hlSTjqB2bEOFE9Vadnw55BrMrul Om1BSKKI0fjFRywMmypbWSSPeD7kgNkLx06aOC3Cn4EblGnVJ3G5EOvKVn4V0E/7 FKfyXnfSpIWzR71IYVED4Qa9j7/9fCDn4jTQ3XEmxmi/+iM9B8DUy4xiQb1Tp6jM Dz5Dh5QaxpTEQ8u/xMwa9ELcZbouxnThPXAsX5HJhUmS/OjQ8oO8VmS+0RqQwAoa h+w4v1MKrzjf3XeMZbqiggnO8VuefA== =8JjN -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed May 10 17:05:52 2017 Received: (at 26815) by debbugs.gnu.org; 10 May 2017 21:05:52 +0000 Received: from localhost ([127.0.0.1]:37242 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8Ynw-00064c-34 for submit@debbugs.gnu.org; Wed, 10 May 2017 17:05:52 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33215) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8Ynu-00064K-Ia for 26815@debbugs.gnu.org; Wed, 10 May 2017 17:05:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8Yni-0006PY-7L for 26815@debbugs.gnu.org; Wed, 10 May 2017 17:05:41 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_40,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:38041) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8Yni-0006PS-4C; Wed, 10 May 2017 17:05:38 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:59530 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d8Ynh-0005w3-H2; Wed, 10 May 2017 17:05:37 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Marius Bakke Subject: Re: bug#26815: [PATCH 3/3] vm: Add UEFI loader to disk images. References: <87efvzl7w8.fsf@gnu.org> <20170510195227.13461-1-mbakke@fastmail.com> <20170510195227.13461-3-mbakke@fastmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 21 =?utf-8?Q?Flor=C3=A9al?= an 225 de la =?utf-8?Q?R?= =?utf-8?Q?=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-unknown-linux-gnu Date: Wed, 10 May 2017 23:05:35 +0200 In-Reply-To: <20170510195227.13461-3-mbakke@fastmail.com> (Marius Bakke's message of "Wed, 10 May 2017 21:52:27 +0200") Message-ID: <87r2zwqv6o.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Hi Marius, Marius Bakke skribis: > * gnu/system/vm.scm (qemu-image): Add GRUB-EFI to inputs. Append 40MiB EFI > System Partition. > * gnu/build/vm.scm (install-efi): New procedure. > (initialize-hard-disk): Generate grub EFI blob when ESP is present. [...] > +(define (install-efi esp grub.cfg) > + "Write a self-contained Grub UEFI blob to the mounted ESP using GRUB.C= FG." I=E2=80=99m really nitpicking here, but the spelling is =E2=80=9CGRUB=E2=80= =9D. :-) > + (with-output-to-file grub.cfg > + (lambda _ > + (format #t > + "insmod part_msdos~@ Nitpicking too, but I have a preference for the more explicit: (call-with-output-file grub.cfg (lambda (port) (format port =E2=80=A6))) Otherwise the whole series LGTM. Do I get it right that =E2=80=98disk-image=E2=80=99 will now give us UEFI-e= nabled images? (Should we mention it in guix.texi?) Thanks a lot! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Wed May 10 17:21:07 2017 Received: (at 26815) by debbugs.gnu.org; 10 May 2017 21:21:08 +0000 Received: from localhost ([127.0.0.1]:37259 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8Z2h-0006Ps-MM for submit@debbugs.gnu.org; Wed, 10 May 2017 17:21:07 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:36275) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8Z2d-0006PV-7Q for 26815@debbugs.gnu.org; Wed, 10 May 2017 17:21:06 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 09729208C1; Wed, 10 May 2017 17:21:03 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Wed, 10 May 2017 17:21:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=LobCHNV2o310cNO6lLJycB352DkTud378M0X+2Kan bA=; b=1xbe8t8IP1Ybwm7CyF+lQ+oAtlutC7MeOj3Ql4hfR9Ogdhrnd+9QWQUov UrhnJz7DCF+ghrEsfhQ3KXwKNInGh7IvGnggfDSXJdodbsv9mk90aYGZ8KYJo/ME avi4xYpQ0FgKWfNt6Z5Qbu3Sc1xBpoixSRvoxHUoQ5uaGLm716C8W/VTMS1JhJWf jtQ+M2aKAxBeq9IDeRpYLpoeQsX1nC9d4NBKuhBJ8lxnUuEBjKw+AUUy9DcgZA5v ZdztwXBukt9pas5uXTTO0/hbYDoUwuN7J64RUkzFJQUMzpm1eImWJ3r6OWdU/Chp KXA/jFVSIPt/pYm5rB0+KnrLMFzog== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=LobCHNV2o310cNO6lL JycB352DkTud378M0X+2KanbA=; b=arvusN5q5+TCxqYBiR6MobkvatNO7k48WQ vwGWxjClWfz0+Sui7akoiBtWDTvkJdqnZ9w1zElmsRJqxg2gZGUSyw45rSNzQofT 94cwOAnUgVHlu8B9/y+4+eOfeBmyJqpLHTIhwSC2cFUKUO73ZRJaXSTfkgaRXLV4 JgdZutOiigJhaN6Z0cnOhrm21r/0aHKGNi1bKabxSUah5Kiol1n02Qa66m0A57NO fqRMj4PmCg8icdlHto42RFoEaLe3WeDhIOhruocta7CKKa/ySTLmGJuIPx8T3ldj LsLmy7BtoD39DUXc03cy9flBufFrGXvUaDvSUAa9J3lUfYtgzdtA== X-ME-Sender: X-Sasl-enc: /7NN8YAKpNfXP3SXdqRQmNe8qY2jmJhElRq5LsMPjCPC 1494451262 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 946A6248EC; Wed, 10 May 2017 17:21:02 -0400 (EDT) From: Marius Bakke To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#26815: [PATCH 3/3] vm: Add UEFI loader to disk images. In-Reply-To: <87r2zwqv6o.fsf@gnu.org> References: <87efvzl7w8.fsf@gnu.org> <20170510195227.13461-1-mbakke@fastmail.com> <20170510195227.13461-3-mbakke@fastmail.com> <87r2zwqv6o.fsf@gnu.org> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Wed, 10 May 2017 23:21:00 +0200 Message-ID: <877f1ol877.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Hi Marius, > > Marius Bakke skribis: > >> * gnu/system/vm.scm (qemu-image): Add GRUB-EFI to inputs. Append 40MiB E= FI >> System Partition. >> * gnu/build/vm.scm (install-efi): New procedure. >> (initialize-hard-disk): Generate grub EFI blob when ESP is present. > > [...] > >> +(define (install-efi esp grub.cfg) >> + "Write a self-contained Grub UEFI blob to the mounted ESP using GRUB.= CFG." > > I=E2=80=99m really nitpicking here, but the spelling is =E2=80=9CGRUB=E2= =80=9D. :-) Aah, forgot it was an acronym. Will fix! >> + (with-output-to-file grub.cfg >> + (lambda _ >> + (format #t >> + "insmod part_msdos~@ > > Nitpicking too, but I have a preference for the more explicit: > > (call-with-output-file grub.cfg > (lambda (port) > (format port =E2=80=A6))) Duly noted. > Do I get it right that =E2=80=98disk-image=E2=80=99 will now give us UEFI= -enabled > images? (Should we mention it in guix.texi?) Indeed! It should even work on EFI-enabled ARM hardware. It probably deserves a mention in the manual somewhere. Will have a look. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkThD0ACgkQoqBt8qM6 VPq9OggAtbjxDtMeyo9FZFtBR4yvUcuRZd5rushkU09au6NGCxyEK4ZnEoBcpVd2 oHayFOE6MQms4p+t7YHQfAVsopjTft+W314VQZTypPIEXlqt7tHjE+c5hiaiZgH7 PgQlEGHmhGkostDPtM/cSNFENjRwrImGuEgeuRRT4PyCf/C426Gq6UfIMR5I9iEc jfEXeWcEGE3lAZJmp8Ym7IEI2qelFW5gdkEQ1RfdRMRZNgkFm7BKGW3OpGJEtkaO s73zc9Q5A7/cvuo7RjyDrOgU/XV0N/3V3Ps/nNcpCyW7bCnH1y4XpDcQBQrxU1X5 WOEWgeyLzBqHdgU26KZ9LXzUH2zsKg== =D+EV -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri May 12 18:07:22 2017 Received: (at 26815) by debbugs.gnu.org; 12 May 2017 22:07:23 +0000 Received: from localhost ([127.0.0.1]:41405 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9IiY-0004rb-Ki for submit@debbugs.gnu.org; Fri, 12 May 2017 18:07:22 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46038) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9IiX-0004rO-7b for 26815@debbugs.gnu.org; Fri, 12 May 2017 18:07:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d9IiO-0006pK-QB for 26815@debbugs.gnu.org; Fri, 12 May 2017 18:07:15 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_20,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:35269) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d9IiD-0006eI-Dd; Fri, 12 May 2017 18:07:01 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:40350 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d9IiC-0004K4-Lg; Fri, 12 May 2017 18:07:01 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Marius Bakke Subject: Re: bug#26815: [PATCH 3/3] vm: Support EFI boot in base image. References: <20170507143647.21036-1-mbakke@fastmail.com> <20170507143647.21036-3-mbakke@fastmail.com> <20170507171814.555ec8b3@scratchpost.org> <87r300xyqq.fsf@fastmail.com> <87d1bjyay3.fsf@fastmail.com> <87efvzl7w8.fsf@gnu.org> <87inl8lbzz.fsf@fastmail.com> Date: Sat, 13 May 2017 00:06:57 +0200 In-Reply-To: <87inl8lbzz.fsf@fastmail.com> (Marius Bakke's message of "Wed, 10 May 2017 21:58:56 +0200") Message-ID: <87k25l6872.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org, Mathieu Othacehe , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Hey Marius! (+ Cc: Mathieu O.) Marius Bakke skribis: > I've sent a new patch series taking the reviews into account. The > patches from id:20170506154154.17836-1-m.othacehe@gmail.com are still > required. Gnus doesn=E2=80=99t find this message ID. Which patch is it? It seems th= at I=E2=80=99m preventing progress but I=E2=80=99d rather not! > (Also, --size=3D1G is no longer enough after the Guile 2.2 transition!) Heheh. :-) Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Fri May 12 19:12:53 2017 Received: (at 26815) by debbugs.gnu.org; 12 May 2017 23:12:53 +0000 Received: from localhost ([127.0.0.1]:41468 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9Jjx-0006UA-3H for submit@debbugs.gnu.org; Fri, 12 May 2017 19:12:53 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:51845) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9Jju-0006U0-Lc for 26815@debbugs.gnu.org; Fri, 12 May 2017 19:12:51 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 6B10520809; Fri, 12 May 2017 19:12:46 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Fri, 12 May 2017 19:12:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=ugMMCYtzRCuA7DvC4nOdGudiTu3/AILSULdJTN+2O YI=; b=GUB38U7dPQKSML912jqXfOWT2J4pm9Q2Gi0uemY6hicujO5f9xV5YuIfD OIz6wXGeiwcUWP5S9ggCsL8qZaPhE2XwDAvNnV2Wcs+HpDBDf4Qd/a9byxZYncnv Ri13AyyjYUJredZlWFGUNyzIMEC/Pzbv5KqSMCihc0trD+qvej2gAjjqHUZniGR8 v9ZELBIsF4dUbgwEvuUB2tL8TUsogc0wp9gBumWUOVDyBuJW7FXvYny3gWJlofbV txpx/7KAE+oyYkv+sFTPNKr3Jj0ex4oL3pBi8c4M84da4KlA5K+ujv37kRkyf25/ Q7quuXAwStRG5/L7ehRA9OWIlzi3w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=ugMMCYtzRCuA7DvC4n OdGudiTu3/AILSULdJTN+2OYI=; b=SK/Eg/O7pVAScaguPw3kX9CAScTjPSiU8o TDK2MrGqMeioOOEh/rHbzmT3dVK1kG0GxWc+585GhO4ByUx5xRAnEGUaduYhwBkw XgwhUO7dUtcQW2czXeM9XUWb4VocnadDZXalr7cDC8NxcEedN2fzR2fkeFfB5bxk 78sq+MmWlxTLPXe9uuKAC9RqWFmot80zta5qlbNCGuHXcEJT6j/IYkHG2/I8L7Sk JmukIFaa3I2YkkoCy0j7gDKISlZg/RuaNLclHjE0FpCHu2gjM9EFDcg3Wt02EWvf 8D9hh7gavE3YhdLbdYX4Vi15PZ6dT2/WL5Gezartq0jYxpa9XcQg== X-ME-Sender: X-Sasl-enc: irvfh1+eaBiIaLsOVONR5fU1ftTMBxlbOHg0jRbUPjZf 1494630766 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 084D37E2B6; Fri, 12 May 2017 19:12:45 -0400 (EDT) From: Marius Bakke To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#26815: [PATCH 3/3] vm: Support EFI boot in base image. In-Reply-To: <87k25l6872.fsf@gnu.org> References: <20170507143647.21036-1-mbakke@fastmail.com> <20170507143647.21036-3-mbakke@fastmail.com> <20170507171814.555ec8b3@scratchpost.org> <87r300xyqq.fsf@fastmail.com> <87d1bjyay3.fsf@fastmail.com> <87efvzl7w8.fsf@gnu.org> <87inl8lbzz.fsf@fastmail.com> <87k25l6872.fsf@gnu.org> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Sat, 13 May 2017 01:12:44 +0200 Message-ID: <87r2zthdoz.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org, Mathieu Othacehe , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Hey Marius! > > (+ Cc: Mathieu O.) > > Marius Bakke skribis: > >> I've sent a new patch series taking the reviews into account. The >> patches from id:20170506154154.17836-1-m.othacehe@gmail.com are still >> required. > > Gnus doesn=E2=80=99t find this message ID. Which patch is it? It seems = that > I=E2=80=99m preventing progress but I=E2=80=99d rather not! Clicking that ID brings me to.. https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D26339#236 I think v4 is being prepared, I'll rebase this series once that is out. Note: for emergency testing you can also fetch all commits here: https://github.com/mbakke/guix/tree/wip-uefi --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkWQWwACgkQoqBt8qM6 VPrv3AgAo9gibuF9SoXlHoJR0ehwEFoZTPA0xhaTPg3LqzbGmKsgybfiTpwExsJ+ fo2gaymoEWBUyPNmVsceJYoe27fsUe93v6FEA9RHsMMPKHX+h1syAHsu9y7pJiM7 6+foHa65iXJD8zTFW6JZ5aroXHR4/aY9EGSRfSxGtKtVOVQ0E+Wf7aSpVHR7kbbM 5//aai4M97u/JuhGAhcbvryhbXRk2SAQgZ9CCYh2lxLUKg7bzOpb/DTKQToDOvc/ ghIbjRfH5MxfRx0WSOSZVwal5YaHjjusvM3q8C9Wl4te0Ui3qlmQHejfgdUzm2/r ysO10Pim6F+x53NBTiiylvNEK7CpOw== =MK+W -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 13 05:18:00 2017 Received: (at 26815) by debbugs.gnu.org; 13 May 2017 09:18:00 +0000 Received: from localhost ([127.0.0.1]:41767 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9TBY-0005Oa-Bv for submit@debbugs.gnu.org; Sat, 13 May 2017 05:18:00 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:32774) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9TBX-0005ON-2U for 26815@debbugs.gnu.org; Sat, 13 May 2017 05:17:59 -0400 Received: by mail-wm0-f67.google.com with SMTP id y10so17858370wmh.0 for <26815@debbugs.gnu.org>; Sat, 13 May 2017 02:17:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version; bh=Q+cXoM35bNL7NEhrbDM7ZW3iAlQGiB6+DIrgadjCESc=; b=ddtgwxODXKUsssBYCULqYRqtR338H2ob4XP3f9u30CUM+ta53/NfRvOatBpNqepa6X Jt2+AK3ruZPzAuoww0F3iDwn3qmcDAAE2pay9uUCi4hHPUte9M6B+Nxbq/5+GPbivlgl xw4JActGZjAMjJZxA78os81z/83TvZPueRWAC/NLQ/0v7FymK4S4YsQuRWWJIjof22fF UGyI7Ow2Iixdd3liB2jNVL8nGqU/NT0PFmDEJ31v0nlEFl2qDetysbn3OUMJ/q+aOBZv HYP5EzHdQkqb9LurgooP3l3zrMfDBKofhwG9c/P4SQET438gCsOKmZlXLRWSdvEUk0AC jCGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version; bh=Q+cXoM35bNL7NEhrbDM7ZW3iAlQGiB6+DIrgadjCESc=; b=tZloRbGWAn6aBBRADp3SJy8n3K3JX2hQIOdlS/Obm45sdwpL94DQamaQ5F+N/26IBN 5xuM3gxlnl5laakYYJUfAs2+gmotIRNwp6mxSzNEtHhHIX8vom0QifM9rkQFsgQl89vx mGuPrPwzX/SRbQjRikyrYkTZekSiR6LbS9vtaOBfx7rBZVD3z4N0NwsgIQVvIgvhFDZA W0St5/NOdemZq3PXtpkv0Y4zC6dSvC2upYdPzYFw3OPSOxo/BYVAoaPvxdSIXNjGSeug reBiyP2XIISiZ+IuCUAMQZLKlwmgtMFG6Q5DEr5YP9UTUtp+931NKirjLcZTvMR39F1s KeoA== X-Gm-Message-State: AODbwcDRR5TI5FrbW/i1cnNemj2vCZkihRXFvGYNqgF1apfYP7hpiNnG lWWlhsQQKitNGw== X-Received: by 10.28.138.73 with SMTP id m70mr520825wmd.99.1494667072354; Sat, 13 May 2017 02:17:52 -0700 (PDT) Received: from cervin (85-169-37-239.rev.numericable.fr. [85.169.37.239]) by smtp.gmail.com with ESMTPSA id w10sm4730564wmw.14.2017.05.13.02.17.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 13 May 2017 02:17:51 -0700 (PDT) References: <20170507143647.21036-1-mbakke@fastmail.com> <20170507143647.21036-3-mbakke@fastmail.com> <20170507171814.555ec8b3@scratchpost.org> <87r300xyqq.fsf@fastmail.com> <87d1bjyay3.fsf@fastmail.com> <87efvzl7w8.fsf@gnu.org> <87inl8lbzz.fsf@fastmail.com> <87k25l6872.fsf@gnu.org> <87r2zthdoz.fsf@fastmail.com> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Mathieu Othacehe To: Marius Bakke Subject: Re: bug#26815: [PATCH 3/3] vm: Support EFI boot in base image. In-reply-to: <87r2zthdoz.fsf@fastmail.com> Date: Sat, 13 May 2017 11:17:51 +0200 Message-ID: <87h90p869s.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org, Ludovic =?utf-8?Q?Court=C3=A8s?= , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) Hi all ! > I think v4 is being prepared, I'll rebase this series once that is out. Yes I'm fighting with btrfs-root-os test failling for my serie. I have the following error that I'm investingating : --8<---------------cut here---------------start------------->8--- + btrfs subvolume create /mnt/home Create subvolume '/mnt/home' + herd start cow-store /mnt herd: exception caught while executing 'start' on service 'cow-store': ERROR: In procedure mount: mount "/.rw-store" on "/gnu/store": Invalid argument environment variable `PATH' set to `/gnu/store/73p6bldnhm9lzcrhy8g96dzxawncd852-qemu-minimal-2.9.0/bin' --8<---------------cut here---------------end--------------->8--- Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat May 13 09:12:09 2017 Received: (at 26815) by debbugs.gnu.org; 13 May 2017 13:12:09 +0000 Received: from localhost ([127.0.0.1]:41885 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9Wq9-00067N-HI for submit@debbugs.gnu.org; Sat, 13 May 2017 09:12:09 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50227) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9Wq8-00067C-GQ for 26815@debbugs.gnu.org; Sat, 13 May 2017 09:12:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d9Wq2-0008EA-IM for 26815@debbugs.gnu.org; Sat, 13 May 2017 09:12:03 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_40,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:48185) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d9Wpx-00084P-N0; Sat, 13 May 2017 09:11:57 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:40570 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d9Wpw-00057W-S1; Sat, 13 May 2017 09:11:57 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Mathieu Othacehe Subject: Re: bug#26815: [PATCH 3/3] vm: Support EFI boot in base image. References: <20170507143647.21036-1-mbakke@fastmail.com> <20170507143647.21036-3-mbakke@fastmail.com> <20170507171814.555ec8b3@scratchpost.org> <87r300xyqq.fsf@fastmail.com> <87d1bjyay3.fsf@fastmail.com> <87efvzl7w8.fsf@gnu.org> <87inl8lbzz.fsf@fastmail.com> <87k25l6872.fsf@gnu.org> <87r2zthdoz.fsf@fastmail.com> <87h90p869s.fsf@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 24 =?utf-8?Q?Flor=C3=A9al?= an 225 de la =?utf-8?Q?R?= =?utf-8?Q?=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-unknown-linux-gnu Date: Sat, 13 May 2017 15:11:54 +0200 In-Reply-To: <87h90p869s.fsf@gmail.com> (Mathieu Othacehe's message of "Sat, 13 May 2017 11:17:51 +0200") Message-ID: <87bmqw52at.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org, Marius Bakke , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Hello! Mathieu Othacehe skribis: >> I think v4 is being prepared, I'll rebase this series once that is out. Thanks Marius for bearing with me. :-) Are there specific bits that are needed here? > Yes I'm fighting with btrfs-root-os test failling for my serie. I have > the following error that I'm investingating : > > + btrfs subvolume create /mnt/home > Create subvolume '/mnt/home' > + herd start cow-store /mnt > herd: exception caught while executing 'start' on service 'cow-store': > ERROR: In procedure mount: mount "/.rw-store" on "/gnu/store": Invalid ar= gument > environment variable `PATH' set to `/gnu/store/73p6bldnhm9lzcrhy8g96dzxaw= ncd852-qemu-minimal-2.9.0/bin' I think this has been reported before and I suspect it=E2=80=99s a non-deterministic bug, not related to the specifics of this test. Not sure what happens. Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sat May 13 10:13:35 2017 Received: (at 26815) by debbugs.gnu.org; 13 May 2017 14:13:35 +0000 Received: from localhost ([127.0.0.1]:43065 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9Xnb-0007os-G9 for submit@debbugs.gnu.org; Sat, 13 May 2017 10:13:35 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:39921) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9XnX-0007oi-IB for 26815@debbugs.gnu.org; Sat, 13 May 2017 10:13:33 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 19DB3207A8; Sat, 13 May 2017 10:13:31 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Sat, 13 May 2017 10:13:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=5Kx7vpnTNneucK5VqpNX3yq6ELwCZbLbig2SWXeEV j4=; b=uy41Z5+oEIMZdT9twH73Yzg9XNcX2WpZOR33jTL38W8VgVaQyXN4hWLXV 9y0b4Vq6yacJ0UoLVa9o5LMHD3BPbrFiDR06jt6bSBnns9u1Orqo85+w/+jaGdAD 7Woy9WqhRVdgiJcq2GAGZHZWD83fKqx2u2YSiX4btit84/wP+x8oHNVPHN/UqqlB vF1WKFDpy/KqpXRY22P35RV9R2l/8jMr/yXJtbqVJKsr26VoEOfU912vZAs+TE8J OFGUAj6LY6PP20O3+HH8YDZnUAu8TY5KTHRun5bh/pZfJKalUaqah7PYuxGl/KSF CxqdJ7cfra43ELGEcE2/3urHIDk/Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=5Kx7vpnTNneucK5Vqp NX3yq6ELwCZbLbig2SWXeEVj4=; b=C4UJMwjsE7xTlwlHJ9R+IPBsigYq+f2T5y 2j2gIt+JfVL50MtJka5ohrJfQzJM0wc/kGGDqWq82DQA2g6tSN3Hk4WYqWBq72hS olGIph45XPIlCJ9A8eoOYPg5pXiyaT4w+5SjwqOpTfz5Qw8bn5A18NWNYGMYnZXb jlnLnVvPXr0rKi5/BqLXvcdTYQSF6dggLJQLxduX3qFMfqCTwRoJI2qG68shXEeR byRWZBP/uv9heGQWnWPanMCeA7ysnulJHtbIxZd/bEzwBciJgN4Ezbt7K/ISiEoW nvvp8dtsC4IveBB5wwB7nMO3T6x9hzVWcDhZEVj/PXk1yNOn7CCQ== X-ME-Sender: X-Sasl-enc: RGOIbQCH+PHVDugKMaffPChxvDvBirJ9JVbdqbqRKE3T 1494684810 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id A7F787E2E3; Sat, 13 May 2017 10:13:30 -0400 (EDT) From: Marius Bakke To: Ludovic =?utf-8?Q?Court=C3=A8s?= , Mathieu Othacehe Subject: Re: bug#26815: [PATCH 3/3] vm: Support EFI boot in base image. In-Reply-To: <87bmqw52at.fsf@gnu.org> References: <20170507143647.21036-1-mbakke@fastmail.com> <20170507143647.21036-3-mbakke@fastmail.com> <20170507171814.555ec8b3@scratchpost.org> <87r300xyqq.fsf@fastmail.com> <87d1bjyay3.fsf@fastmail.com> <87efvzl7w8.fsf@gnu.org> <87inl8lbzz.fsf@fastmail.com> <87k25l6872.fsf@gnu.org> <87r2zthdoz.fsf@fastmail.com> <87h90p869s.fsf@gmail.com> <87bmqw52at.fsf@gnu.org> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Sat, 13 May 2017 16:13:29 +0200 Message-ID: <87o9uwhmk6.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org, Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Hello! > > Mathieu Othacehe skribis: > >>> I think v4 is being prepared, I'll rebase this series once that is out. > > Thanks Marius for bearing with me. :-) > > Are there specific bits that are needed here? The main reason it's blocking is that without it, there is a conflict between "grub" and "grub-efi" in PATH of the qemu image. So "grub-mkstandalone" may not find the EFI target. With the bootloader refactoring, the "normal" bootloader is passed down as a gexp from (gnu system vm), allowing "grub-efi" to reign over PATH. I'd like to make "grub-mkstandalone" a proper bootloader type in the long run, but that requires some other refactoring that I did not feel like embarking on right now :P --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkXFIkACgkQoqBt8qM6 VPrF/QgApnPDfkY4nAvVle03uvNZbri5+Egfem1mlO6HeYu8KZ9zLunNibFZmRzx jBnndLFHDfjJDUmpm6uQMaCOdptMZz/zDhwa0VyUTIbtCEQGpzBiCQO758//yfFm zrd3NuuWwPzoCjMg5opTMAOF9sv+iFlA43iiWzmMk9rjXjAiCXUKCZdP8t9hMOjn XvttIGOK6M1QoWDwWTnda13VxCRzvDrejsSiQG0WHW0EMi4okW9kRcueZnlnZDdA llEMw32uEpoH+cV1vII20jkiG8u11L2ewCHNk0GoYWD3eANNllDglR3Rea3LTF6J xA1nlojvWJ1y4t3LENXmSUevzFdn/g== =T8SY -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 13 15:23:45 2017 Received: (at 26815) by debbugs.gnu.org; 13 May 2017 19:23:45 +0000 Received: from localhost ([127.0.0.1]:43254 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9cdj-0008JV-7K for submit@debbugs.gnu.org; Sat, 13 May 2017 15:23:45 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9cdh-0008JB-7V for 26815@debbugs.gnu.org; Sat, 13 May 2017 15:23:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d9cdV-0001oA-6e for 26815@debbugs.gnu.org; Sat, 13 May 2017 15:23:32 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_20,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:52159) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d9cdL-0001Vx-6m; Sat, 13 May 2017 15:23:19 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:42666 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d9cdK-0002Ed-Cc; Sat, 13 May 2017 15:23:18 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Marius Bakke Subject: Re: bug#26815: [PATCH 3/3] vm: Support EFI boot in base image. References: <20170507143647.21036-1-mbakke@fastmail.com> <20170507143647.21036-3-mbakke@fastmail.com> <20170507171814.555ec8b3@scratchpost.org> <87r300xyqq.fsf@fastmail.com> <87d1bjyay3.fsf@fastmail.com> <87efvzl7w8.fsf@gnu.org> <87inl8lbzz.fsf@fastmail.com> <87k25l6872.fsf@gnu.org> <87r2zthdoz.fsf@fastmail.com> <87h90p869s.fsf@gmail.com> <87bmqw52at.fsf@gnu.org> <87o9uwhmk6.fsf@fastmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 24 =?utf-8?Q?Flor=C3=A9al?= an 225 de la =?utf-8?Q?R?= =?utf-8?Q?=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-unknown-linux-gnu Date: Sat, 13 May 2017 21:23:15 +0200 In-Reply-To: <87o9uwhmk6.fsf@fastmail.com> (Marius Bakke's message of "Sat, 13 May 2017 16:13:29 +0200") Message-ID: <87r2zszhlo.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org, Mathieu Othacehe , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Marius Bakke skribis: > Ludovic Court=C3=A8s writes: > >> Hello! >> >> Mathieu Othacehe skribis: >> >>>> I think v4 is being prepared, I'll rebase this series once that is out. >> >> Thanks Marius for bearing with me. :-) >> >> Are there specific bits that are needed here? > > The main reason it's blocking is that without it, there is a conflict > between "grub" and "grub-efi" in PATH of the qemu image. So > "grub-mkstandalone" may not find the EFI target. > > With the bootloader refactoring, the "normal" bootloader is passed down > as a gexp from (gnu system vm), allowing "grub-efi" to reign over PATH. > > I'd like to make "grub-mkstandalone" a proper bootloader type in the > long run, but that requires some other refactoring that I did not feel > like embarking on right now :P OK, understood! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Tue May 16 11:18:01 2017 Received: (at 26815) by debbugs.gnu.org; 16 May 2017 15:18:02 +0000 Received: from localhost ([127.0.0.1]:48931 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAeEb-0000yL-FT for submit@debbugs.gnu.org; Tue, 16 May 2017 11:18:01 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44682) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAeEZ-0000xy-CC for 26815@debbugs.gnu.org; Tue, 16 May 2017 11:17:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dAeEP-0004mJ-E1 for 26815@debbugs.gnu.org; Tue, 16 May 2017 11:17:54 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:40478) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAeED-0004gP-Do; Tue, 16 May 2017 11:17:37 -0400 Received: from [193.50.110.111] (port=40728 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dAeEC-0007xF-JL; Tue, 16 May 2017 11:17:37 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Marius Bakke Subject: Re: bug#26815: [PATCH 3/3] vm: Support EFI boot in base image. References: <20170507143647.21036-1-mbakke@fastmail.com> <20170507143647.21036-3-mbakke@fastmail.com> <20170507171814.555ec8b3@scratchpost.org> <87r300xyqq.fsf@fastmail.com> <87d1bjyay3.fsf@fastmail.com> <87efvzl7w8.fsf@gnu.org> <87inl8lbzz.fsf@fastmail.com> <87k25l6872.fsf@gnu.org> <87r2zthdoz.fsf@fastmail.com> <87h90p869s.fsf@gmail.com> <87bmqw52at.fsf@gnu.org> <87o9uwhmk6.fsf@fastmail.com> Date: Tue, 16 May 2017 17:17:33 +0200 In-Reply-To: <87o9uwhmk6.fsf@fastmail.com> (Marius Bakke's message of "Sat, 13 May 2017 16:13:29 +0200") Message-ID: <87r2zoygoi.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 26815 Cc: Ricardo Wurmus , 26815@debbugs.gnu.org, Mathieu Othacehe , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Hi Marius! Marius Bakke skribis: > Ludovic Court=C3=A8s writes: > >> Hello! >> >> Mathieu Othacehe skribis: >> >>>> I think v4 is being prepared, I'll rebase this series once that is out. >> >> Thanks Marius for bearing with me. :-) >> >> Are there specific bits that are needed here? > > The main reason it's blocking is that without it, there is a conflict > between "grub" and "grub-efi" in PATH of the qemu image. So > "grub-mkstandalone" may not find the EFI target. > > With the bootloader refactoring, the "normal" bootloader is passed down > as a gexp from (gnu system vm), allowing "grub-efi" to reign over PATH. Mathieu just pushed the bootloader patch series in =E2=80=98master=E2=80=99. However, for the release, I thought it=E2=80=99d be more reasonable to not = rush that patch series, which is why the new =E2=80=98version-0.13.0=E2=80=99 br= anch does not have it. So now the question is, how can we merge your UEFI work? How much work is it to have it on =E2=80=98version-0.13.0=E2=80=99 without merging all th= e of the bootloader patch series? It would be awesome if we could quickly find a way to address this, so we can indeed release tomorrow or later this week. TIA, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Wed May 17 07:05:13 2017 Received: (at 26815) by debbugs.gnu.org; 17 May 2017 11:05:13 +0000 Received: from localhost ([127.0.0.1]:49593 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAwlV-0006dk-Bu for submit@debbugs.gnu.org; Wed, 17 May 2017 07:05:13 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:56769) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAwlT-0006dc-MA for 26815@debbugs.gnu.org; Wed, 17 May 2017 07:05:12 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 7D8CE2258A; Wed, 17 May 2017 07:05:10 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Wed, 17 May 2017 07:05:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=i88aNiYx48eV0bByrxiNqsP5X/upU4kKhkJh8XbVv dE=; b=wY/iXjlMlJk4Lk6THmoXQL78hvTfeGY3HleqXjQqegwgVWwaM55zu7hpw 0jYzQIz1JU6ygtFULlB0ZsvJSWy7gNByrx1q5oemi81AEONnL8GxYn9wpRtE/VOy HUKImgzMcVO8A/S7r5bgip8AkgUSk+FVoVx/wt121bn2nhayeqFvYq2mOoraWy8O vI7Oj60l1i5Z+xlV6lJKvCZ+odpTksUWGQGtvEETcPuRQmR57wNsgw5atrPjI8h9 07iZjuaBpHGVIWBQ/1RB65uJnQSWhTwcXBQgQ71OBq9NVu627djTELAJMa/lf9Qn ZIIPh5kWiA1/PzxerUkgiCau6yVYg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=i88aNiYx48eV0bByrx iNqsP5X/upU4kKhkJh8XbVvdE=; b=i8ncQxriXldHXHOjb/MejrDRXDN4i1I548 dztaS6Bfa52NYB2c9Xqd1E/8fu820uKoiwExAdv2ZRaYvPl1vJLrhSlcWOJPAuTI CWS7nkc/z7HauJoSawi4Us4JZ73LPn+5l8S5yV0beJqf/lVNyGRhTDpp54Xz/Xth bmQ1SAT2rgvF0pJJK6YS3PyAJmq9clSoGcfX6QYtNNKWHNJvWRknkcw+VAtK5OGj K4X72xMk5ixiS9D1wGJL5PDjDiOuLpbonRCpBIK/42TlLc/j/Gq955gPzRk81b4+ /anbJgKtld6Uu9ebhkX7w7cGECxHiJMT0qYRwWuBcGAMrM/8u1JA== X-ME-Sender: X-Sasl-enc: 9Up6PzIuwszF6kvwIyEIa4GyImwMqUg1XABAtk9BluWm 1495019110 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 1113724753; Wed, 17 May 2017 07:05:09 -0400 (EDT) From: Marius Bakke To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#26815: [PATCH 3/3] vm: Support EFI boot in base image. In-Reply-To: <87r2zoygoi.fsf@gnu.org> References: <20170507143647.21036-1-mbakke@fastmail.com> <20170507143647.21036-3-mbakke@fastmail.com> <20170507171814.555ec8b3@scratchpost.org> <87r300xyqq.fsf@fastmail.com> <87d1bjyay3.fsf@fastmail.com> <87efvzl7w8.fsf@gnu.org> <87inl8lbzz.fsf@fastmail.com> <87k25l6872.fsf@gnu.org> <87r2zthdoz.fsf@fastmail.com> <87h90p869s.fsf@gmail.com> <87bmqw52at.fsf@gnu.org> <87o9uwhmk6.fsf@fastmail.com> <87r2zoygoi.fsf@gnu.org> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Wed, 17 May 2017 13:05:07 +0200 Message-ID: <8737c3eobg.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815 Cc: Ricardo Wurmus , 26815@debbugs.gnu.org, Mathieu Othacehe , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Ludovic, Ludovic Court=C3=A8s writes: > Mathieu just pushed the bootloader patch series in =E2=80=98master=E2=80= =99. Excellent news! > However, for the release, I thought it=E2=80=99d be more reasonable to no= t rush > that patch series, which is why the new =E2=80=98version-0.13.0=E2=80=99 = branch does not > have it. > > So now the question is, how can we merge your UEFI work? How much work > is it to have it on =E2=80=98version-0.13.0=E2=80=99 without merging all = the of the > bootloader patch series? The problem was that "grub-efi" and "grub" conflicts in PATH without the bootloader patches. Any ideas for how to use the proper grub-efi object? > It would be awesome if we could quickly find a way to address this, so > we can indeed release tomorrow or later this week. Yay! I've sent an updated patch set, although yet untested due to lack of substitutes! Will get on the OpenSSH bug ASAP. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkcLmQACgkQoqBt8qM6 VPpuwwf5AeYPPSC7Zo4OwtZqTtboYOL2Kr4dEClnyFpoI1Io+bwF8ixupcfHjqlh uDHkfnOdDP1/pR2Xs3egZzbJsAm7aqOmytjKUmn5JrXDFVftz4RZhUW4XT3Dw+VG 2e5Bn9NWmmj/s55rJEvCpUEv8O/Y3O9ExlLUxEQbfL5IalD006/ctp1A3RixUOxV uA/q86IzELIKL2/kdgXwVoi2jj+5nU+TDHlTaTT8KzIHoZUI+A0V1GSsbQR94d+e dvVDqie3JszI1hEc2WeA/2z5h+PTcYm9MVs3jd7SbrTY3cpBZkcBMWlsOLnusgDf toErUKGjG84E/QBJ4V0bE76NaPVlvg== =gtof -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed May 17 07:05:35 2017 Received: (at 26815) by debbugs.gnu.org; 17 May 2017 11:05:36 +0000 Received: from localhost ([127.0.0.1]:49598 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAwlr-0006eJ-KE for submit@debbugs.gnu.org; Wed, 17 May 2017 07:05:35 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:47911) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAwlp-0006e9-3U for 26815@debbugs.gnu.org; Wed, 17 May 2017 07:05:34 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id F2F2522592; Wed, 17 May 2017 07:05:32 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Wed, 17 May 2017 07:05:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=bWa++abjSGt0YXXroq 9mh0v8iGnT2HV32yM5LGPzWD4=; b=TbHXkjVm/N8RqVpdUIruiJ/2UikOQq3bnt ikSz4TbWCn7H4Y6VWQ0hqDX/ZtKzbGIRD0SAv3ySMe3q7EwQ4DTd/EXVyWLoHvk8 n9I/VpjmGwIdPBAKuZ+ozfDZyaUbYe5wuUiPKqOwPxDdikI5cGEIjD8UFoAANOtG q29/IsaTKxnADTPBqWprYFWNawl34kXeW0LWid24hqqyuZEyQHE/UEhzPdM+r4+5 IVwWsd+uhB3I0+FfJobjHZpVsnjhDTp+S8by5ca7x1iip00CH3SJEOzLT/j33Jrv lNrqqcII9kzo4QOfostZCLlhGDnXNouRe2Npo3baNBHBZDSVT7bg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s= fm1; bh=bWa++abjSGt0YXXroq9mh0v8iGnT2HV32yM5LGPzWD4=; b=eoL/k9S9 d0Pt0Q7w3Ch2bcNpkWp5yd8RR6CaOoo+kgzYyLVSBAOQiYIDpfV/TqXoh+uByKhT DTnDdPmhJ9kOOoZuM5g3MRGEDhSKum57hnE0Z9hOclgp5GxCMVV62/Rt+jxd93FH /hwGFzJ+RUdsN0AUuGqFPRBy5YqnDZFANVSCHGzvQ1+v3AJFkF7eL+32XWvag1BG zuxyMiL+JguMaJ1vhkrO9R6Iz3AdNIdYUQgrb/lz5MkmRy6ZpjXglB6Npx4n2iXR Hwl/VyEMG3TyFA9Dj43dyR5tZKF352EA9xVZcCdr+CnTRWqXY7FYsRDFLQ2hV8KT 1tBR3NsiyN30QQ== X-ME-Sender: X-Sasl-enc: f2edc7PJF57wSk+aowku8t9SrkH8mNMVXxEp4qkT+2At 1495019132 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 74FB524009; Wed, 17 May 2017 07:05:32 -0400 (EDT) From: Marius Bakke To: 26815@debbugs.gnu.org Subject: [PATCH v4 1/3] vm: Support arbitrary partition flags. Date: Wed, 17 May 2017 13:05:20 +0200 Message-Id: <20170517110522.18106-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <87r2zoygoi.fsf@gnu.org> References: <87r2zoygoi.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/build/vm.scm (): Change BOOTABLE? to FLAGS. (initialize-partition-table): Pass each flag to parted. (initialize-hard-disk): Locate boot partition. * gnu/system/vm.scm (qemu-image): Adjust partition flags. --- gnu/build/vm.scm | 17 ++++++++++++----- gnu/system/vm.scm | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 9a77bee72..c7449cfbe 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,7 +42,7 @@ partition-size partition-file-system partition-label - partition-bootable? + partition-flags partition-initializer root-partition-initializer @@ -141,7 +142,7 @@ the #:references-graphs parameter of 'derivation'." (size partition-size) (file-system partition-file-system (default "ext4")) (label partition-label (default #f)) - (bootable? partition-bootable? (default #f)) + (flags partition-flags (default '())) (initializer partition-initializer (default (const #t)))) (define (fold2 proc seed1 seed2 lst) ;TODO: factorize @@ -168,9 +169,10 @@ actual /dev name based on DEVICE." (cons* "mkpart" "primary" "ext2" (format #f "~aB" offset) (format #f "~aB" (+ offset (partition-size part))) - (if (partition-bootable? part) - `("set" ,(number->string index) "boot" "on") - '()))) + (append-map (lambda (flag) + (list "set" (number->string index) + (symbol->string flag) "on")) + (partition-flags part)))) (define (options partitions offset) (let loop ((partitions partitions) @@ -303,6 +305,11 @@ in PARTITIONS, and using BOOTCFG as its bootloader configuration file. Each partition is initialized by calling its 'initializer' procedure, passing it a directory name where it is mounted." + + (define (partition-bootable? partition) + "Return the first partition found with the boot flag set." + (member 'boot (partition-flags partition))) + (let* ((partitions (initialize-partition-table device partitions)) (root (find partition-bootable? partitions)) (target "/fs")) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 2ee5c2b1e..e0e4d33d4 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -231,7 +231,7 @@ the image." (* 10 (expt 2 20)))) (label #$file-system-label) (file-system #$file-system-type) - (bootable? #t) + (flags '(boot)) (initializer initialize))))) (initialize-hard-disk "/dev/vda" #:partitions partitions -- 2.13.0 From debbugs-submit-bounces@debbugs.gnu.org Wed May 17 07:05:40 2017 Received: (at 26815) by debbugs.gnu.org; 17 May 2017 11:05:40 +0000 Received: from localhost ([127.0.0.1]:49603 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAwlv-0006ea-Vk for submit@debbugs.gnu.org; Wed, 17 May 2017 07:05:40 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:37509) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAwlu-0006eS-3o for 26815@debbugs.gnu.org; Wed, 17 May 2017 07:05:38 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 01AA122321; Wed, 17 May 2017 07:05:38 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Wed, 17 May 2017 07:05:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=09utZp FtjBSEpdtJxrBB00DhT4GRrIv/XOyvNmdLMg4=; b=PHndcBKSJwqQnCT48nQW7e Qxgz8FlvRy8dwtbhCf5WiECjmiBGj5Dw2O1W5tQtQaNfLjUmsszjlj79TKVkfXIG K7jFulraDFKkzcELp4MaRa28uvgiW/kdfAnCbVD4yJUdGYQBLJDRc52lqfgN0NbN xC0PRVngWtEmdY5GTG+DF3aAdV300R+o9cN8vCH8DVmm2oIHf4F2VTRLqUzCG9UI L4Q94F399Y3FpEhjPNJo41GxUpbZ9R6jij5d1iFXKsaIMTm9NWbDbiwDjeM0M7Cr om6pDq8vd3O3W1eYLeoxz90l5lON4nHEfoNFZNf4JU8vYBZrDbDEDqxU5D4E9a2Q == DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=09utZpFtjBSEpdtJxrBB00DhT4GRrIv/XOyvNmdLM g4=; b=UlmG4yFQem8xd6eKwNq2maJDY4sRJO8EFENeLHAnbSkpHdhYaAqyohv4O Ca9hpzZhiRbO3zn1Sv/ox6o/Cm0Evi6HQ5p6Ee0Rh+p674A0tglvglUF6x9iSglY Qp80yaPNhZknXDluP+Eslccqb7EM9lmhpLNB4jjDt8PyukN35GVJ+xwwN5wIwSkN CKrHeE4Q6RJBdhNeNBQ8353lpAv9Mxmy7hukzsMFxd6IC4S4/JVghRhP/7kcO3Cm ptilHLhj/Pcb2fX6/ABPWusOsIItycM6DT61uV1YqHY8r6kSgeEENipl4PiyafyD j/lVxdjMBH0DwtO8WfyiyHwgakIVg== X-ME-Sender: X-Sasl-enc: FsA/ATzeMKp36m55oVJCEopgJ1mbjHUf1WCv9P6qrNAV 1495019137 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 94AAB24009; Wed, 17 May 2017 07:05:37 -0400 (EDT) From: Marius Bakke To: 26815@debbugs.gnu.org Subject: [PATCH v4 2/3] vm: Support creating FAT partitions. Date: Wed, 17 May 2017 13:05:21 +0200 Message-Id: <20170517110522.18106-2-mbakke@fastmail.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170517110522.18106-1-mbakke@fastmail.com> References: <87r2zoygoi.fsf@gnu.org> <20170517110522.18106-1-mbakke@fastmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/build/vm.scm (create-ext-file-system, create-fat-file-system): New procedures. (format-partition): Use them. Error for unknown file systems. * gnu/system/vm.scm (qemu-image): Include DOSFSTOOLS. * gnu/system/linux-initrd.scm (base-initrd): Always add nls_is8859-1.ko. --- gnu/build/vm.scm | 30 ++++++++++++++++++++++++++---- gnu/system/linux-initrd.scm | 4 +--- gnu/system/vm.scm | 2 +- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index c7449cfbe..7ce1ec8e1 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -213,10 +213,10 @@ actual /dev name based on DEVICE." (define MS_BIND 4096) ; again! -(define* (format-partition partition type - #:key label) - "Create a file system TYPE on PARTITION. If LABEL is true, use that as the -volume name." +(define* (create-ext-file-system partition type + #:key label) + "Create an ext-family filesystem of TYPE on PARTITION. If LABEL is true, +use that as the volume name." (format #t "creating ~a partition...\n" type) (unless (zero? (apply system* (string-append "mkfs." type) "-F" partition @@ -225,6 +225,28 @@ volume name." '()))) (error "failed to create partition"))) +(define* (create-fat-file-system partition + #:key label) + "Create a FAT filesystem on PARTITION. The number of File Allocation Tables +will be determined based on filesystem size. If LABEL is true, use that as the +volume name." + (format #t "creating FAT partition...\n") + (unless (zero? (apply system* "mkfs.fat" partition + (if label + `("-n" ,label) + '()))) + (error "failed to create FAT partition"))) + +(define* (format-partition partition type + #:key label) + "Create a file system TYPE on PARTITION. If LABEL is true, use that as the +volume name." + (cond ((string-prefix? "ext" type) + (create-ext-file-system partition type #:label label)) + ((or (string-prefix? "fat" type) (string= "vfat" type)) + (create-fat-file-system partition #:label label)) + (else (error "Unsupported file system.")))) + (define (initialize-partition partition) "Format PARTITION, a object with a non-#f 'device' field, mount it, run its initializer, and unmount it." diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index dfe198e43..3a5e76034 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -268,6 +268,7 @@ loaded at boot time in the order in which they appear." "usbhid" "hid-generic" "hid-apple" ;keyboards during early boot "dm-crypt" "xts" "serpent_generic" "wp512" ;for encrypted root partitions "nvme" ;for new SSD NVMe devices + "nls_iso8859-1" ;for `mkfs.fat`, et.al ,@(if (string-match "^(x86_64|i[3-6]86)-" (%current-system)) '("pata_acpi" "pata_atiixp" ;for ATA controllers "isci") ;for SAS controllers like Intel C602 @@ -281,9 +282,6 @@ loaded at boot time in the order in which they appear." ,@(if (find (file-system-type-predicate "9p") file-systems) virtio-9p-modules '()) - ,@(if (find (file-system-type-predicate "vfat") file-systems) - '("nls_iso8859-1") - '()) ,@(if (find (file-system-type-predicate "btrfs") file-systems) '("btrfs") '()) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index e0e4d33d4..64770baf1 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -203,7 +203,7 @@ the image." (guix build utils)) (let ((inputs - '#$(append (list qemu parted e2fsprogs) + '#$(append (list qemu parted e2fsprogs dosfstools) (map canonical-package (list sed grep coreutils findutils gawk)) (if register-closures? (list guix) '()))) -- 2.13.0 From debbugs-submit-bounces@debbugs.gnu.org Wed May 17 07:05:43 2017 Received: (at 26815) by debbugs.gnu.org; 17 May 2017 11:05:43 +0000 Received: from localhost ([127.0.0.1]:49608 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAwlz-0006eq-8T for submit@debbugs.gnu.org; Wed, 17 May 2017 07:05:43 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:32895) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAwlx-0006ei-6Y for 26815@debbugs.gnu.org; Wed, 17 May 2017 07:05:41 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 16C7B22592; Wed, 17 May 2017 07:05:41 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Wed, 17 May 2017 07:05:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=AlLgOuk7zbVWkvGt/k m27se8pR2d0yR6w2wxd/1EcrE=; b=FVnSumsumpsnmg/obObPZ1aiFYh1fR9RPH iJJf77hHbOlviBhpJ7zVSK2UrRa3eZRWyzg9Vak1JFmbu4PaG8A94+RuLfIWBscA sfpq5JPsRNzVsqfO9sR0Mci3jYRvK0m98RLfrmIwO4Bo0hM5TU0XlV5O4zkGRcZQ qGPt5Vv6qE4M1ZbMkNB1TR9JbqyLLSfaFxhIqx0xH3j+o7RZpM5FjlphkJEK+MZR 0d3UhttXglCkTmnOD3bVmGLpuwOO+itSgHeg0Poic0z8qiqGC8rOaZ/qES37+jWo ZG63AYz2D/MM9VkFDl43x5e0zAdM8vfFPm/R3o8jLlNzOmKDbUfA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s= fm1; bh=AlLgOuk7zbVWkvGt/km27se8pR2d0yR6w2wxd/1EcrE=; b=TBE4rOx/ BoJQ2FRlr7e9gdZZtA8NEHmoYoOULzzoz+7tAcUsTaVMATIN4InhjMSfO65P+VBp oAuiPw4g5qktCY79Sdr3STkbV4Lb72MjxIuiRcodZubO43BH57nz+M4hUtF+7Y61 InXDcugDaP/nCyppSM7ULoUrWUrHwzfCBf2hMTgESyQEoLJbkkVLSee9GreztlvQ WBtiGiIP/vKT5/k+XQLeWmKeqQ1Tufw9h+6fdoM4Me4D6eb/NvvRhAG30URWvtDo HohJk+crrLNDgVncp/iGMsjGag/Ah9NcOSxVpUABm6O+JM0SEc+7+eU0nku/Oh6d H13li+3/PtqB3g== X-ME-Sender: X-Sasl-enc: PuxziiTVtyXJvgW4+02Q1UnGmtGK3Z6whtui9gU7zy2o 1495019140 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id A540D24009; Wed, 17 May 2017 07:05:40 -0400 (EDT) From: Marius Bakke To: 26815@debbugs.gnu.org Subject: [PATCH v4 3/3] vm: Add UEFI loader to disk images. Date: Wed, 17 May 2017 13:05:22 +0200 Message-Id: <20170517110522.18106-3-mbakke@fastmail.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170517110522.18106-1-mbakke@fastmail.com> References: <87r2zoygoi.fsf@gnu.org> <20170517110522.18106-1-mbakke@fastmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/system/vm.scm (qemu-image): Add GRUB-EFI to inputs. Append 40MiB EFI System Partition. * gnu/build/vm.scm (install-efi): New procedure. (initialize-hard-disk): Generate grub EFI blob when ESP is present. --- gnu/build/vm.scm | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ gnu/system/vm.scm | 19 +++++++++++++++--- 2 files changed, 75 insertions(+), 3 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 7ce1ec8e1..aca35999b 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -27,6 +27,7 @@ #:use-module (gnu build linux-boot) #:use-module (gnu build install) #:use-module (guix records) + #:use-module (ice-9 format) #:use-module (ice-9 match) #:use-module (ice-9 regex) #:use-module (srfi srfi-1) @@ -315,6 +316,33 @@ SYSTEM-DIRECTORY is the name of the directory of the 'system' derivation." (mkdir-p directory) (symlink bootcfg (string-append directory "/bootcfg")))) +(define (install-efi esp config-file) + "Write a self-contained GRUB EFI loader to the mounted ESP using CONFIG-FILE." + (let* ((system %host-type) + ;; Hard code the output location to a well-known path recognized by + ;; compliant firmware. See "3.5.1.1 Removable Media Boot Behaviour": + ;; http://www.uefi.org/sites/default/files/resources/UEFI%20Spec%202_6.pdf + (efi-directory (string-append esp "/EFI/BOOT")) + ;; Map grub target names to boot file names. + (efi-targets (cond ((string-prefix? "x86_64" system) + '("x86_64-efi" . "BOOTX64.EFI")) + ((string-prefix? "i686" system) + '("i386-efi" . "BOOTIA32.EFI")) + ((string-prefix? "armhf" system) + '("arm-efi" . "BOOTARM.EFI")) + ((string-prefix? "aarch64" system) + '("arm64-efi" . "BOOTAA64.EFI"))))) + ;; GRUB requires a TMPDIR to prepare the firmware image. + (setenv "TMPDIR" esp) + + (mkdir-p efi-directory) + (unless (zero? (system* "grub-mkstandalone" "-O" (car efi-targets) + "-o" (string-append efi-directory "/" + (cdr efi-targets)) + ;; Graft the configuration file onto the image. + (string-append "boot/grub/grub.cfg=" config-file))) + (error "failed to create GRUB EFI image")))) + (define* (initialize-hard-disk device #:key bootloader-package @@ -332,8 +360,13 @@ passing it a directory name where it is mounted." "Return the first partition found with the boot flag set." (member 'boot (partition-flags partition))) + (define (partition-esp? partition) + "Return the first EFI System Partition." + (member 'esp (partition-flags partition))) + (let* ((partitions (initialize-partition-table device partitions)) (root (find partition-bootable? partitions)) + (esp (find partition-esp? partitions)) (target "/fs")) (unless root (error "no bootable partition specified" partitions)) @@ -345,8 +378,34 @@ passing it a directory name where it is mounted." (mount (partition-device root) target (partition-file-system root)) (install-boot-config bootcfg bootcfg-location target) (when bootloader-installer + (display "installing bootloader...\n") (bootloader-installer bootloader-package device target)) + (when esp + ;; Mount the ESP somewhere and install GRUB UEFI image. + (let ((mount-point (string-append target "/boot/efi")) + (grub-config (string-append target "/tmp/grub-standalone.cfg"))) + (display "mounting EFI system partition...\n") + (mkdir-p mount-point) + (mount (partition-device esp) mount-point + (partition-file-system esp)) + + ;; Create a tiny configuration file telling the embedded grub + ;; where to load the real thing. + (call-with-output-file grub-config + (lambda (port) + (format port + "insmod part_msdos~@ + search --set=root --label gnu-disk-image~@ + configfile /boot/grub/grub.cfg~%"))) + + (display "creating EFI firmware image...") + (install-efi mount-point grub-config) + (display "done.\n") + + (delete-file grub-config) + (umount mount-point))) + ;; Register BOOTCFG as a GC root. (register-bootcfg-root target bootcfg) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 64770baf1..e0af90bee 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -203,7 +204,7 @@ the image." (guix build utils)) (let ((inputs - '#$(append (list qemu parted e2fsprogs dosfstools) + '#$(append (list qemu parted e2fsprogs dosfstools grub-efi) (map canonical-package (list sed grep coreutils findutils gawk)) (if register-closures? (list guix) '()))) @@ -228,11 +229,23 @@ the image." #:system-directory #$os-drv)) (partitions (list (partition (size #$(- disk-image-size - (* 10 (expt 2 20)))) + (* 50 (expt 2 20)))) (label #$file-system-label) (file-system #$file-system-type) (flags '(boot)) - (initializer initialize))))) + (initializer initialize)) + ;; Append a small EFI System Partition for + ;; use with UEFI bootloaders. + (partition + ;; The standalone grub image is about 10MiB, but + ;; leave some room for custom or multiple images. + (size (* 40 (expt 2 20))) + (label "GNU-ESP") ;cosmetic only + ;; Use "vfat" here since this property is used + ;; when mounting. The actual FAT-ness is based + ;; on filesystem size (16 in this case). + (file-system "vfat") + (flags '(esp)))))) (initialize-hard-disk "/dev/vda" #:partitions partitions #:bootloader-package -- 2.13.0 From debbugs-submit-bounces@debbugs.gnu.org Wed May 17 08:36:22 2017 Received: (at 26815) by debbugs.gnu.org; 17 May 2017 12:36:22 +0000 Received: from localhost ([127.0.0.1]:49690 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAyBh-0003qq-OB for submit@debbugs.gnu.org; Wed, 17 May 2017 08:36:21 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:44209) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAyBf-0003qi-PD for 26815@debbugs.gnu.org; Wed, 17 May 2017 08:36:20 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 83EAC208C0; Wed, 17 May 2017 08:36:19 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Wed, 17 May 2017 08:36:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=Dm2AdE46+u9aNxiZZqXkW6lffC8eT/NJaAFJH1Qtr J8=; b=SZk9kZagk/T+vh7gESmULfUGXpxbTpZPLMXllGN97yVCozw3ahc/Hvdy1 KThEEYHaEkC3DUrm1Jsox68/3b3styPKzne1dSdL+qS9rinomsLzyUwJCdDGWm3Q yDoeKcAZiRmm2oW0j2c4bJlPLbuzzB4zlMG8y8g20DXvx7ZLfBTQsvsLifWJZHAZ v+Oygz5vHIESJ0oPEPusBr5wnsQv5H7/QMB6aBtilDolfguQwSucpwHo8orDKCv3 hps9LU/MDF2mwYetc2vC73qv9DnzEB9x9omqlJHI7oyb2sduYHtN/ESx35+zCsiY SRDeh7pQf2Ju7qN/CckrPMc+6vcag== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=Dm2AdE46+u9aNxiZZq XkW6lffC8eT/NJaAFJH1QtrJ8=; b=h8Q+t4+TURl6f051ydy8s9WSm/Z37WmAvZ Szcj7AF6aLZ5EXwXoIMplnbFkcZ85lpAqwRwXSCZbgJq+fumpDiaShNmANnw51jc +JIS0e6XCOWVxDKE2eap7WmRGDM+He+1MQvhZLWuSh2U6/PjLz6oYX3z376DsPqb 2hygtjUVNYbtApXVCcgsa1ejNs7Wx5hkP9Q6xZxMDPb285tOo0qmbpIhtCVWPuYc h4FWT1XUv3nlSShutkoxMEJC2hTadd/mYlyILuPe5aUYQ+iEfvupMEZUvhX/RhIT PFcIrLZHQA6mDFV2D+ti5NV4aIlCEpYKb7nUtP4au2cm8CNQ4+XA== X-ME-Sender: X-Sasl-enc: xL9dVJcRIEkd1Kh8dJGENa/HJzox46KjOKnZSfZDR3sP 1495024579 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 004C62475D; Wed, 17 May 2017 08:36:18 -0400 (EDT) From: Marius Bakke To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#26815: [PATCH 3/3] vm: Support EFI boot in base image. In-Reply-To: <8737c3eobg.fsf@fastmail.com> References: <20170507143647.21036-1-mbakke@fastmail.com> <20170507143647.21036-3-mbakke@fastmail.com> <20170507171814.555ec8b3@scratchpost.org> <87r300xyqq.fsf@fastmail.com> <87d1bjyay3.fsf@fastmail.com> <87efvzl7w8.fsf@gnu.org> <87inl8lbzz.fsf@fastmail.com> <87k25l6872.fsf@gnu.org> <87r2zthdoz.fsf@fastmail.com> <87h90p869s.fsf@gmail.com> <87bmqw52at.fsf@gnu.org> <87o9uwhmk6.fsf@fastmail.com> <87r2zoygoi.fsf@gnu.org> <8737c3eobg.fsf@fastmail.com> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Wed, 17 May 2017 14:36:17 +0200 Message-ID: <87wp9fd5j2.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815 Cc: Ricardo Wurmus , 26815@debbugs.gnu.org, Mathieu Othacehe , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Marius Bakke writes: > Yay! I've sent an updated patch set, although yet untested due to lack > of substitutes! Will get on the OpenSSH bug ASAP. Both patch series tested on a physical and virtual machine. I do get some scary warnings at login time, not sure if they were there before. "stty: 'standard input': Input/output error" Screenshot attached. --=-=-= Content-Type: image/png Content-Disposition: attachment; filename=install.png Content-Transfer-Encoding: base64 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 QMABAAAIOAAAAAQcAACAgAMAABBwAAAACDgAAAABBwAAIOAAAAAQcAAAAAIOAABAwAEAACDgAAAA BBwAAICAI96yLK9lWS7bGK3LfpT/ldusZj1C46d0fN2hnUva4O7j7+n7l7vWr1a+xjnAOO9lWV7f 39+7O+e9v5/5/v62U7/AhCC1X3sJjZ/W42v29snZJmedjObUo2X/1Cjf1dt+9Ph/wvqvvA0DFAUc muA5/NBpn1kCpdwDGjOX7ypj+6huo+v79PUDCDhe5UcAQ98/W75etj7KffSZ1PKtv3t0lKt1/nv1 rNn+obptzx7k9k+L9isdX6ntH+qbowncWfu13r6uMP5KJ/yh8dsqYIjJv+X2EbP/S51Yp7Rvaf1i t49QvY6+H+qfK2z/ALe3LMvP6/X6k9Z/3/tMzPdi/5ayfO//U8p3lkrrVJL/dllu++eUodb6a7Rf qF4lZYlps9zxe9Z+pev85L9Otfq+x/ir1ae1+7pW+VpvHzH/P0P75o6v0funntt/7rYrSZJ09fR1 dhSnJUeA5mqPlpe3tK7bDGOpZRm+v7//y3/9/7bHv0f9c85ufL5fc/939/1b78vhZm9Pv2cA57Iv qZrwTM2tO2pk/WpcxjHqCWDM1b6tLjspHaPby29yApaZt4/R278JOoCA4xY/EI4o9ll/zsTj7Hrx WpPYlvlTf6I5a/+sy5dzFi93Yn6V/evsT3IDYE5e/EfyxMPjj5nNJ0DIGZuhz+9dsvXU7cP2P0fg DnC5gGN9/fL2/0t+pEt/5GtMQO4+wbrquvT9s8df6Ls5AcN6f9ViQny2b2wx3lq/byb3KXtXGG8z b//2TcBTvfd+oLc/Rns/4GePDoyZAKQsj50M5H5/L5+a5Qvl36t+R/1Ta/2x7Xc0IQyVL3Z8HeUf av/c8VtrMtsq/9HjL9Q/tcZH6/Y/Wmft7aNF/8fcO1M6/kvv9Tjr37PfqKtv/wBP8O/1+7gqABIm xyadABDHPRwAAEAzb00AcM4lNQCQzyVVAABAMy6pAgAABBwAAICAAwAAQMABAAAIOAAAAAEHAACA gAMAABBwAAAAAg4AAAABBwAAIOAAAAAEHAAAAAIOAABAwAEAAAg4AAAABBwAAICAAwAAEHC8Xsuy aCmm13qcHuV/le1jVPs8ZXzVrH9KXr3afVkWvwU33n71P9DSO7Qj+/7+vtwOuXaZl2X5k+f2b9s2 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 lmX52f4tZlls2ssj9m8l69zmt/53aZl6lP/sbzHLtymlf4/W9fn/2PWXtv+o9itdV808c9u/pCy1 xl+P7evoszHrb7X/2Ptuz/EvSZIkSaPTtE+pqn2Er+URwxFHI1PW+f39/d/n1//fsyyzHbG90xHk 2cdfaRlr1K80j5ptfMXtBQBKvGeZMI2+4bP0STQtn2QzQ/vUrn/MZUdPar/R41f9nr3/A4DbBxzr H9pRP7wl6zu6hvtO7dO6/r0eWHDHiV2P8ad+L+MTADJNd0nV55Ifz77XPtqvXp3X9TV2xgdQxicA Ao6JfoBHraOkTLXrc7XJR43y7uWR+6b2p03ejp769Gm/GkfPR7bpiHWnrHPviVOfti85W5M7/gFg tN0X/x1NSkqvNT7Kf++IXosbm48eaxm7/qP67+Vdc2IQKl+t9oup395nSuuf0/4ztl/r7SdlbNd6 lPVs4++sfqH277X/SG2PHvs/ABjp/72HA2bn5YnaUfsDwLV8aQJM0gAAaMUZDnhIsLYmcNP+ACDg AAAALs8lVQAAgIADAAAQcAAAAAg4AAAAAQcAACDgAAAAEHAAAAACDgAAQMABAAAg4AAAAAQcAACA gAMAAEDAAQAACDgAAAABBwAAgIADAAAQcAAAAAKO9pZlmbqRZi/fFc3Upq3L0rOuy7J0b1vbh/YB gDPvzw/i9/f37g/l3t/hLhO+O43vq2+vn36yzwGAGwYccGfrCawg+hr9BADcLOD4/v7+MxHb+3fK JC5nYrdex15+Jes/+37r8sWW/yz/ULlCZ6hK1h9TvpT6zzqxLB1/sXU8Gq8tJ98tx1+N7WP9maNt OTb/vf1ZSfu03n+Ubl+99n8AUOLn9Xr9LMvy8/n/7b+3y1KXh9KyLE3Xf4XyneUfU76z/y9df+36 7+XXKx2VtbR+sd+PHYs543OdUvKvMf5K2q92/6SOrxn2HzPv/yRJkiSpNH1tjwrmnp0odba+GY7G tS5Dy/xj8g59pmb5Zjy6Wjr+Yj6Tsl2ltNH39/d/n1//f88+mWn7qFGW2vUp2b6cjQDg6t7bH7ZZ r3EP3fi7vXwodElCz/L1WH9p+UonOXd/Ek9p/c62q3WwP8u21/qSrtmCzdnbf/b9HwBEBxwzT/ZK f0BHH4EdOZHpMQG581HYWuMvFHSs871be85en5nb/wr7PwA448V/0HFSG5oofi6JckS6bIJe0kfa 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 6QzlOnoDe87nYn5AR9S/1Vu+76L142Cf/OQw9xgBgICj66R+5slX6F0XtSaaI+pvkscM2/7Tgy8A uGXA8flxPzvDEDoCebZ8vWxvsh5zZmDvxWPb7xyVv3RCs/3cyLMPZ/Urrf9ZIFXS/6X1K63/DOUf 3f8xfRyz7qPtN3b7bhlQjOz/luuPGd+l4yc0PlqPv5T2EYgCXNPPsiw/y7L8vH6fWPXz+dve/+cs P/vb+u/r/57lv7e8pPyl6bP+bUr5furyVvXP6cvS9i3Nv9f4rTHWY8dPzf6vNeZzxmluWXLar0f/ j1h/bP/mbl+l/Vc6/lLbJ3X/KkmSJI1PXzMeNQqVZW/5yPJ/1v39/f3//j/l+6U3C9/t8qvU/Ft/ vnVd98bQVetTepYi5+zH2ed7tOds20PN/GI+23P8OcMBcD1vO/W5gqzYSw5SfpSPLkGrPVGcuW1b 3xB/Vv+jZbNsY7OUr+V9G2f9M3p8tN5+atSvZP9z9f0HAA0DDtJ/LLfXKpccWd1+f/YA8CrlazWx rH2E/Wl91zrYiL1nYMT46NEHJfWLab+77z8AKDPVi/9iLy2a8WhYyWUxju717ydt3n+7PhrvMz2R 6u7jw/gH4LEBx/aU/3bCvg5EakxO7vBjm3OJQ632i1l/65fMzd7fJnRtx1/NvqnRV6l59DyoUnss 9hjbOZco9ngxJwB5oi6p2jsithcQHC0/CixS11EjoDla1ywBV0n71vqR37ucq2X5rpJ/bvu0Hh+5 gX3t78csT5lE1mrD0PZfo33PHgs7evsu3T/X2n/G5t9q/QCM8+/1+7iqy/FiMLgu2y8APMeXJgAA AFq5zFOqelxSBNh+AYC6LntJFQAAMD+XVAEAAAKOHmZ/8sms7ycZ3W53eWJN63pc/VHDAMA1vY8m ECOusW71ll/SJ5D6AACAagHH3iMqRzy20iR3XLAxQ/8DAHDTgCN2UnoUHHwmp0cvvoqd0J6d4Qgd gS85Qr/+7lEZSuu//nvqmZxQ+WKW9wgojurfuv9arz/UvzW2n17jLyf/UNsCAIT8LMvy8/p9WtVu 2lu+/tuyLH8+s10ek2fKZ3PzT61n7fqHyp1Tvlptmtt+pf1f2n+t1x/KP6ffam4TseUryT/U3pIk SZIkSUfpnXvUfevpl1/d4ahvyVHss8/ntE3N9c/Yvyn5xXy25/jbnk0BADjz3k5YYi+5SJkAfSYo 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 9betSpIkSZL0avFYXAAAgFLvXityyQIAADzPv9fvqQ4AAIDqXFIFAAAIOOjznomW65j9ccKj6nX1 9V+lHrVf1gkAxHkf/YCOuMfirm85r6X1+0u820A7AAA0CTj2JlgjJl0mecwQbAAAUDngyJmIrYOD T3By9Cbi2IDm7AxH6AxM6RmakvxD9Z+h/LUn4qn9H9PHMeve+37M8tjxV3IWaWT/t1x/zPguHT+h 8dF6/KW0jwMjAJAu+GKvveXrvy3L8ucz2+WvyJeJxX42N//c+rWsf+v2ian/NtXs/1elF8jljNPY soT6I6b9evT/iPXH9m/u9lXaf6XjL7V99tYnSZIkSVLgxX+fo4Mll5Pc7fKr1Pxbf751XT/lWf// VeuTc2agtPxn3+/RnrNtDzXzi/lsz/HnDAcApHlvf0RjLzlI+VH+BDTrdbS+5Gcm68s9Wk1Wzup/ tGyWidPs5WvdP6PHR+vtp0b9SvY/V99/AMBtAo69wGMbNMzsKuVrNbGsfYT9aX23nXDWDIrP7lea YXz06IOS+sW03933HwBwZV8tfrw5n9i0frwtf9t878bhbZ9sLy0zPtQPAKgUcOTIucThc59Ijclc 60tErv6SMBO6tuOvZt/U6KvUPHpeYlV7LPYY2zmXKPZ4MScAXNF7PRnbTtC2k7Wj5bV/5Pcu52pZ vqvkn9s+tSbrpfmXXssf+n7M8pHBTuy/c8p69ljY0dt3bP5H/RfTXiXjJ7V9nKEBgDT/Xr+Pq4JH 8TZxAIA+vjQBAADQylsT8AQ9LgkEAOAvl1QBAADNuKQKAAAQcPQw+5NnRr4teuZ2u8sTg1rX4+qP egYArul9NIEYcY17q7cskzd51A8AAFQJOPYeETrisaEmuONoewAAmgUcMc7OgHyCk6MXj8UGNGdn OEJnYErO0Ky/e1SG0vqv/556JidUvpjlPQLKo/q37r/W6w/1b43tp9f4y8k/1LYAACE/y7L8vH6f VrWb9pav/7Ysy5/PbJfH5Jny2dz8U+tZu/6hcueUr0b5U9tqm1dJ/5f2X+v1h/LP6bea20Rs+WqN j731SZIkSZIkHaV37lH3radffnX1o76lZxjOPp/TNjXXP2P/puQX89me4297NgUA4Mx7O2GJveQi ZQL0maCs19Hycp4eE/KaE8DRN20fXcJWc/1n7Vcj4C3tv5bjp0b9Wo6/HtsPACDgeO0FHtugYWZX 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 AQAAIOAAAAAEHAAAgIADAABAwAEAAAg4AAAAAQcAAICAAwAAEHAAAAACDgAAAAEHAAAg4AAAAAQc AAAAAg4AAEDAAQAACDgAAAAEHAAAgIADAAAQcAAAAAg4AAAAAQcAAICAAwAAEHAAAAACDgAAAAEH AAAg4AAAAAQcAAAAAg4AAEDAAQAACDgAAAAEHAAAgIADAAAQcAAAAAg4AAAAAQcAACDgAAAAEHAA AAACDgAAQMABAAAg4AAAAAQcAACAgAMAAEDAAQAACDgAAAABBwAAgIADAAAQcAAAAAIOAAAAAQcA ACDgAAAAEHAAAAACDgAAQMABAAAg4AAAAAQcAACAgAMAAEDAAQAACDgAAAABBwAAgIADAAAQcAAA AAIOAAAAAQcAACDgAAAABBwAAAACDgAAQMABAAAIOAAAAAQcAACAgAMAABBwAAAACDgAAAABBwAA IOAAAAAQcAAAAAIOAABAwKEJAAAAAQcAACDgAAAAEHAAAAACDgAAQMABAAAg4AAAAAQcAACAgAMA AEDAAQAACDgAAAABBwAAgIADAAAQcAAAAAIOAAAAAQcAACDgAAAABBwAAAACDgAAQMABAAAIOAAA AAQcAACAgAMAABBwAAAACDgAAAABBwAAIOAAAAAQcAAAAAIOAAAAAQcAACDgAAAABBwAAAACDgAA QMABAAAIOAAAAAQcAACAgAMAABBwAAAACDgAAAABBwAAIOAAAAAQcAAAAAIOAABAwAEAACDgAAAA BBwAAICAAwAAQMABAAAIOAAAAAEHAACAgAMAABBwAAAAAg4AAAABBwAAIOAAAACe6/8AbI5/UqYX 2foAAAAASUVORK5CYII= --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkcQ8EACgkQoqBt8qM6 VPpTZgf/agzte6fsf06/1s2DX4t2ltHUjqp1HiEmrbeVumPHO5oHfVzM/z1DH1yi C17JgaquQ5FC+EcFfp0Qkn664WJ/4wsRdLzDRGs/h9cqIQgWbZQ66YejEpIzvOka ldqmZPoFFCvLEDB68GHq8AYaG+6wJFr2niZORHHr1nEP1tgTpHXxCVyTu9AxctFC J54fwgPt7304AfMTAs0n4UnbR9wvnXGAgWUvMC3EuJ8NRbtgy/jG5mXdVRvVbQ1V RYdHBHBa8ENte+N+kW1QlIeGIHdc0mTim+bCUZ3nRobKGZhDNNtDu5h9miUMKqC3 Gd1I81z80+QBb9o8s8/Eudlc7H5hwQ== =mGWB -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed May 17 09:42:22 2017 Received: (at 26815) by debbugs.gnu.org; 17 May 2017 13:42:22 +0000 Received: from localhost ([127.0.0.1]:49775 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAzDa-0005No-G2 for submit@debbugs.gnu.org; Wed, 17 May 2017 09:42:22 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21046) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAzDY-0005Ng-SO for 26815@debbugs.gnu.org; Wed, 17 May 2017 09:42:21 -0400 Received: from localhost (port-92-200-235-5.dynamic.qsc.de [92.200.235.5]) by mx.zohomail.com with SMTPS id 1495028530082301.49266138499775; Wed, 17 May 2017 06:42:10 -0700 (PDT) References: <20170507143647.21036-1-mbakke@fastmail.com> <20170507143647.21036-3-mbakke@fastmail.com> <20170507171814.555ec8b3@scratchpost.org> <87r300xyqq.fsf@fastmail.com> <87d1bjyay3.fsf@fastmail.com> <87efvzl7w8.fsf@gnu.org> <87inl8lbzz.fsf@fastmail.com> <87k25l6872.fsf@gnu.org> <87r2zthdoz.fsf@fastmail.com> <87h90p869s.fsf@gmail.com> <87bmqw52at.fsf@gnu.org> <87o9uwhmk6.fsf@fastmail.com> <87r2zoygoi.fsf@gnu.org> <8737c3eobg.fsf@fastmail.com> <87wp9fd5j2.fsf@fastmail.com> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Ricardo Wurmus To: Marius Bakke Subject: Re: bug#26815: [PATCH 3/3] vm: Support EFI boot in base image. In-reply-to: <87wp9fd5j2.fsf@fastmail.com> X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Wed, 17 May 2017 15:42:06 +0200 Message-ID: <877f1fsiq9.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org, Ludovic =?utf-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Marius Bakke writes: > Marius Bakke writes: > >> Yay! I've sent an updated patch set, although yet untested due to lack >> of substitutes! Will get on the OpenSSH bug ASAP. > > Both patch series tested on a physical and virtual machine. > > I do get some scary warnings at login time, not sure if they were there > before. > > "stty: 'standard input': Input/output error" > > Screenshot attached. I have noticed messages like this before on my laptop. I don’t think that’s related to your changes. -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From debbugs-submit-bounces@debbugs.gnu.org Wed May 17 15:47:49 2017 Received: (at 26815) by debbugs.gnu.org; 17 May 2017 19:47:49 +0000 Received: from localhost ([127.0.0.1]:51335 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dB4vE-0005t4-To for submit@debbugs.gnu.org; Wed, 17 May 2017 15:47:49 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57782) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dB4vD-0005ss-Na for 26815@debbugs.gnu.org; Wed, 17 May 2017 15:47:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dB4v5-0004af-96 for 26815@debbugs.gnu.org; Wed, 17 May 2017 15:47:42 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:36279) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dB4uv-0004Pd-5r; Wed, 17 May 2017 15:47:29 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:48428 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dB4uu-00079N-9m; Wed, 17 May 2017 15:47:28 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Marius Bakke Subject: Re: bug#26815: [PATCH 3/3] vm: Support EFI boot in base image. References: <20170507143647.21036-1-mbakke@fastmail.com> <20170507143647.21036-3-mbakke@fastmail.com> <20170507171814.555ec8b3@scratchpost.org> <87r300xyqq.fsf@fastmail.com> <87d1bjyay3.fsf@fastmail.com> <87efvzl7w8.fsf@gnu.org> <87inl8lbzz.fsf@fastmail.com> <87k25l6872.fsf@gnu.org> <87r2zthdoz.fsf@fastmail.com> <87h90p869s.fsf@gmail.com> <87bmqw52at.fsf@gnu.org> <87o9uwhmk6.fsf@fastmail.com> <87r2zoygoi.fsf@gnu.org> <8737c3eobg.fsf@fastmail.com> <87wp9fd5j2.fsf@fastmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 28 =?utf-8?Q?Flor=C3=A9al?= an 225 de la =?utf-8?Q?R?= =?utf-8?Q?=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-unknown-linux-gnu Date: Wed, 17 May 2017 21:47:25 +0200 In-Reply-To: <87wp9fd5j2.fsf@fastmail.com> (Marius Bakke's message of "Wed, 17 May 2017 14:36:17 +0200") Message-ID: <871srnw9iq.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 26815 Cc: Ricardo Wurmus , 26815@debbugs.gnu.org, Mathieu Othacehe , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Marius Bakke skribis: > Marius Bakke writes: > >> Yay! I've sent an updated patch set, although yet untested due to lack >> of substitutes! Will get on the OpenSSH bug ASAP. > > Both patch series tested on a physical and virtual machine. > > I do get some scary warnings at login time, not sure if they were there > before. > > "stty: 'standard input': Input/output error" > > Screenshot attached. Indeed, not related to your changes, you can feel good. :-) https://bugs.gnu.org/23194 Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Wed May 17 17:21:55 2017 Received: (at 26815) by debbugs.gnu.org; 17 May 2017 21:21:55 +0000 Received: from localhost ([127.0.0.1]:51404 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dB6OJ-00084W-3g for submit@debbugs.gnu.org; Wed, 17 May 2017 17:21:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51084) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dB6OG-00084K-Qm for 26815@debbugs.gnu.org; Wed, 17 May 2017 17:21:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dB6O8-0004tX-IL for 26815@debbugs.gnu.org; Wed, 17 May 2017 17:21:47 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:37684) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dB6O8-0004tT-F5; Wed, 17 May 2017 17:21:44 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:48570 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dB6O7-000386-QE; Wed, 17 May 2017 17:21:44 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Marius Bakke Subject: Re: bug#26815: [PATCH v4 1/3] vm: Support arbitrary partition flags. References: <87r2zoygoi.fsf@gnu.org> <20170517110522.18106-1-mbakke@fastmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 28 =?utf-8?Q?Flor=C3=A9al?= an 225 de la =?utf-8?Q?R?= =?utf-8?Q?=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-unknown-linux-gnu Date: Wed, 17 May 2017 23:21:41 +0200 In-Reply-To: <20170517110522.18106-1-mbakke@fastmail.com> (Marius Bakke's message of "Wed, 17 May 2017 13:05:20 +0200") Message-ID: <877f1fuql6.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Marius Bakke skribis: > * gnu/build/vm.scm (): Change BOOTABLE? to FLAGS. > (initialize-partition-table): Pass each flag to parted. > (initialize-hard-disk): Locate boot partition. > * gnu/system/vm.scm (qemu-image): Adjust partition flags. [...] > * gnu/build/vm.scm (create-ext-file-system, create-fat-file-system): New = procedures. > (format-partition): Use them. Error for unknown file systems. > * gnu/system/vm.scm (qemu-image): Include DOSFSTOOLS. > * gnu/system/linux-initrd.scm (base-initrd): Always add nls_is8859-1.ko. LGTM (I think they=E2=80=99re unchanged, right?). Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Wed May 17 17:28:40 2017 Received: (at 26815) by debbugs.gnu.org; 17 May 2017 21:28:40 +0000 Received: from localhost ([127.0.0.1]:51412 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dB6Uq-0008E0-2y for submit@debbugs.gnu.org; Wed, 17 May 2017 17:28:40 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52877) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dB6Un-0008Dn-UR for 26815@debbugs.gnu.org; Wed, 17 May 2017 17:28:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dB6Uf-0008Pr-Hq for 26815@debbugs.gnu.org; Wed, 17 May 2017 17:28:32 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:37762) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dB6Uf-0008Pl-EQ; Wed, 17 May 2017 17:28:29 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:48572 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dB6Ue-0006FC-Lv; Wed, 17 May 2017 17:28:29 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Marius Bakke Subject: Re: bug#26815: [PATCH v4 3/3] vm: Add UEFI loader to disk images. References: <87r2zoygoi.fsf@gnu.org> <20170517110522.18106-1-mbakke@fastmail.com> <20170517110522.18106-3-mbakke@fastmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 28 =?utf-8?Q?Flor=C3=A9al?= an 225 de la =?utf-8?Q?R?= =?utf-8?Q?=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-unknown-linux-gnu Date: Wed, 17 May 2017 23:28:26 +0200 In-Reply-To: <20170517110522.18106-3-mbakke@fastmail.com> (Marius Bakke's message of "Wed, 17 May 2017 13:05:22 +0200") Message-ID: <87ziebtbph.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Marius Bakke skribis: > * gnu/system/vm.scm (qemu-image): Add GRUB-EFI to inputs. Append 40MiB EFI > System Partition. > * gnu/build/vm.scm (install-efi): New procedure. > (initialize-hard-disk): Generate grub EFI blob when ESP is present. [...] > +(define (install-efi esp config-file) > + "Write a self-contained GRUB EFI loader to the mounted ESP using CONFI= G-FILE." > + (let* ((system %host-type) > + ;; Hard code the output location to a well-known path recognize= d by > + ;; compliant firmware. See "3.5.1.1 Removable Media Boot Behavi= our": > + ;; http://www.uefi.org/sites/default/files/resources/UEFI%20Spe= c%202_6.pdf > + (efi-directory (string-append esp "/EFI/BOOT")) > + ;; Map grub target names to boot file names. > + (efi-targets (cond ((string-prefix? "x86_64" system) > + '("x86_64-efi" . "BOOTX64.EFI")) > + ((string-prefix? "i686" system) > + '("i386-efi" . "BOOTIA32.EFI")) > + ((string-prefix? "armhf" system) > + '("arm-efi" . "BOOTARM.EFI")) > + ((string-prefix? "aarch64" system) > + '("arm64-efi" . "BOOTAA64.EFI"))))) > + ;; GRUB requires a TMPDIR to prepare the firmware image. > + (setenv "TMPDIR" esp) > + > + (mkdir-p efi-directory) > + (unless (zero? (system* "grub-mkstandalone" "-O" (car efi-targets) > + "-o" (string-append efi-directory "/" > + (cdr efi-targets)) > + ;; Graft the configuration file onto the ima= ge. > + (string-append "boot/grub/grub.cfg=3D" confi= g-file))) So this is where we need to make sure we=E2=80=99re taking =E2=80=98grub-mk= standalone=E2=80=99 from =E2=80=98grub-efi=E2=80=99 and not =E2=80=98grub=E2=80=99, right? How= do we ensure that? > +++ b/gnu/system/vm.scm > @@ -3,6 +3,7 @@ > ;;; Copyright =C2=A9 2016 Christopher Allan Webber > ;;; Copyright =C2=A9 2016 Leo Famulari > ;;; Copyright =C2=A9 2017 Mathieu Othacehe > +;;; Copyright =C2=A9 2017 Marius Bakke > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -203,7 +204,7 @@ the image." > (guix build utils)) >=20=20 > (let ((inputs > - '#$(append (list qemu parted e2fsprogs dosfstools) > + '#$(append (list qemu parted e2fsprogs dosfstools grub-e= fi) > (map canonical-package > (list sed grep coreutils findutils gawk)) > (if register-closures? (list guix) '()))) > @@ -228,11 +229,23 @@ the image." > #:system-directory #$os-drv)) > (partitions (list (partition > (size #$(- disk-image-size > - (* 10 (expt 2 20)))) > + (* 50 (expt 2 20)))) > (label #$file-system-label) > (file-system #$file-system-type) > (flags '(boot)) > - (initializer initialize))))) > + (initializer initialize)) > + ;; Append a small EFI System Partiti= on for > + ;; use with UEFI bootloaders. > + (partition > + ;; The standalone grub image is abo= ut 10MiB, but > + ;; leave some room for custom or mu= ltiple images. > + (size (* 40 (expt 2 20))) > + (label "GNU-ESP") ;cosm= etic only > + ;; Use "vfat" here since this prope= rty is used > + ;; when mounting. The actual FAT-ne= ss is based > + ;; on filesystem size (16 in this c= ase). > + (file-system "vfat") > + (flags '(esp)))))) > (initialize-hard-disk "/dev/vda" > #:partitions partitions > #:bootloader-package I thought we=E2=80=99d pass something like (initialize-hard-disk =E2=80=A6 #:grub-efi #$grub-eif) to avoid the ambiguity? Once we=E2=80=99re done with that, we=E2=80=99ll have to update one of the =E2=80=98operating-system=E2=80=99 declaration examples to show UEFI config= uration, and to update the doc to explain the installation process for UEFI. Anyway, thanks for the updated patch series, looks like we=E2=80=99re almost there! :-) Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Thu May 18 12:21:41 2017 Received: (at 26815) by debbugs.gnu.org; 18 May 2017 16:21:41 +0000 Received: from localhost ([127.0.0.1]:53671 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBOBJ-0004Qb-9w for submit@debbugs.gnu.org; Thu, 18 May 2017 12:21:41 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:54133) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBOBH-0004QQ-39 for 26815@debbugs.gnu.org; Thu, 18 May 2017 12:21:40 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 1CFA023105; Thu, 18 May 2017 12:21:37 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Thu, 18 May 2017 12:21:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=23KsD0LVLd1/YVQAeA/65yE50h3Wn/VpA69YzcceT K0=; b=hNi4CQ4e3gumHO5/tSPzoLoV14PRoYlkroz/YiETYOR73a8HeI3LNwE7L ooEq0qELmsbk8Kiu+dWW/WW8tRXd7OAhVfbBnp8yP8PGxAnseivZRLnkaTYDXBN6 gahtRDFzZMTcN5gY3+Dwv+vKp+abuwIQCrhjaVLHaN204X+aTwJVrklrVOvMYezM jZoFdnRHOKmAYc2ZhZVT3HJ6+3nleTMNDPwQ4PV1T9q7zJ7RvwvXeg/dq0eYbTYK Noi4EucsjwSVDcBcn9Q6P9mZUkArQIBbV1faMNtiv+uQwMaDlcqKYNIAK+NEn8If T4mG2zdPT/mUNw+RLtXR1Jcs6Qqbw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=23KsD0LVLd1/YVQAeA /65yE50h3Wn/VpA69YzcceTK0=; b=rP6r2SLlKDWIO8DYR+1C2pMjcFTpUDCUvG 45BZvHqNmIPpXjNi/5xSAwTrhz2BmeOWw66g5UBYw7rCBM8mhMHM6MiZDnbwqCLR fiOM2E66gLbdBQP2fmJYE7+Rix/rzugT+cWL4D9poi2qjZyZkeLilHhiwfGiFfo8 k0zY4ydFixcXXDsAU7njTKbTfA1vqzkXntqL28NIy7Q3p565HrafeESWhiF8L0bX MPaInPf0UpW8gSi3bf+IMxv5lTcgEKhjmt00Xtx+AdnNU8bQHdh0goWI1t+hahVQ YIiiEaPUZ8u0G2JlyPqfPlej1O/oARl65N01OOhBST5gW27BmWBg== X-ME-Sender: X-Sasl-enc: W0VA8e74KdvZ1+qcVxcCZ7Q5m8nOjvlQGrwDt+pRgZlv 1495124496 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id A09377E7B1; Thu, 18 May 2017 12:21:36 -0400 (EDT) From: Marius Bakke To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#26815: [PATCH v4 3/3] vm: Add UEFI loader to disk images. In-Reply-To: <87ziebtbph.fsf@gnu.org> References: <87r2zoygoi.fsf@gnu.org> <20170517110522.18106-1-mbakke@fastmail.com> <20170517110522.18106-3-mbakke@fastmail.com> <87ziebtbph.fsf@gnu.org> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Thu, 18 May 2017 18:21:35 +0200 Message-ID: <877f1ecf00.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: >> +++ b/gnu/system/vm.scm >> @@ -228,11 +229,23 @@ the image." >> #:system-directory #$os-drv)) >> (partitions (list (partition >> (size #$(- disk-image-size >> - (* 10 (expt 2 20)))) >> + (* 50 (expt 2 20)))) >> (label #$file-system-label) >> (file-system #$file-system-type) >> (flags '(boot)) >> - (initializer initialize))))) >> + (initializer initialize)) >> + ;; Append a small EFI System Partit= ion for >> + ;; use with UEFI bootloaders. >> + (partition >> + ;; The standalone grub image is ab= out 10MiB, but >> + ;; leave some room for custom or m= ultiple images. >> + (size (* 40 (expt 2 20))) >> + (label "GNU-ESP") ;cos= metic only >> + ;; Use "vfat" here since this prop= erty is used >> + ;; when mounting. The actual FAT-n= ess is based >> + ;; on filesystem size (16 in this = case). >> + (file-system "vfat") >> + (flags '(esp)))))) >> (initialize-hard-disk "/dev/vda" >> #:partitions partitions >> #:bootloader-package > > I thought we=E2=80=99d pass something like > > (initialize-hard-disk =E2=80=A6 #:grub-efi #$grub-eif) > > to avoid the ambiguity? Thanks for the hint. With the attached patch, grub-efi is now passed through to "install-efi". I haven't tested it on "version-0.13.0" but assume it will work. Now, I would like to instead implement an #:efi-loader keyword, and pass it a derivation for the standalone EFI blob, but I'm not sure if I can do that before the weekend. What do you think, is this "good enough" for the time being? > Once we=E2=80=99re done with that, we=E2=80=99ll have to update one of the > =E2=80=98operating-system=E2=80=99 declaration examples to show UEFI conf= iguration, and > to update the doc to explain the installation process for UEFI. I'll get on that. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-vm-Initialize-hard-disk-now-takes-a-grub-efi-paramet.patch Content-Transfer-Encoding: quoted-printable From=20b2236aa915bfb32e974546790a1e87ef1b268403 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 18 May 2017 18:10:31 +0200 Subject: [PATCH] vm: Initialize-hard-disk now takes a grub-efi parameter. * gnu/build/vm.scm (initialize-hard-disk): Learn #:grub-efi. (install-efi): Use it. * gnu/system/vm.scm (qemu-image): Pass it. =2D-- gnu/build/vm.scm | 8 +++++--- gnu/system/vm.scm | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index c0c4c17fb..57619764c 100644 =2D-- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -316,12 +316,13 @@ SYSTEM-DIRECTORY is the name of the directory of the = 'system' derivation." (mkdir-p directory) (symlink bootcfg (string-append directory "/bootcfg")))) =20 =2D(define (install-efi esp config-file) +(define (install-efi grub esp config-file) "Write a self-contained GRUB EFI loader to the mounted ESP using CONFIG-= FILE." (let* ((system %host-type) ;; Hard code the output location to a well-known path recognized = by ;; compliant firmware. See "3.5.1.1 Removable Media Boot Behaviou= r": ;; http://www.uefi.org/sites/default/files/resources/UEFI%20Spec%= 202_6.pdf + (grub-mkstandalone (string-append grub "/bin/grub-mkstandalone")) (efi-directory (string-append esp "/EFI/BOOT")) ;; Map grub target names to boot file names. (efi-targets (cond ((string-prefix? "x86_64" system) @@ -336,7 +337,7 @@ SYSTEM-DIRECTORY is the name of the directory of the 's= ystem' derivation." (setenv "TMPDIR" esp) =20 (mkdir-p efi-directory) =2D (unless (zero? (system* "grub-mkstandalone" "-O" (car efi-targets) + (unless (zero? (system* grub-mkstandalone "-O" (car efi-targets) "-o" (string-append efi-directory "/" (cdr efi-targets)) ;; Graft the configuration file onto the image. @@ -349,6 +350,7 @@ SYSTEM-DIRECTORY is the name of the directory of the 's= ystem' derivation." bootcfg bootcfg-location bootloader-installer + (grub-efi #f) (partitions '())) "Initialize DEVICE as a disk containing all the objects list= ed in PARTITIONS, and using BOOTCFG as its bootloader configuration file. @@ -400,7 +402,7 @@ passing it a directory name where it is mounted." configfile /boot/grub/grub.cfg~%"))) =20 (display "creating EFI firmware image...") =2D (install-efi mount-point grub-config) + (install-efi grub-efi mount-point grub-config) (display "done.\n") =20 (delete-file grub-config) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index e0af90bee..d282ba557 100644 =2D-- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -204,7 +204,7 @@ the image." (guix build utils)) =20 (let ((inputs =2D '#$(append (list qemu parted e2fsprogs dosfstools grub-e= fi) + '#$(append (list qemu parted e2fsprogs dosfstools) (map canonical-package (list sed grep coreutils findutils gawk)) (if register-closures? (list guix) '()))) @@ -248,6 +248,7 @@ the image." (flags '(esp)))))) (initialize-hard-disk "/dev/vda" #:partitions partitions + #:grub-efi #$grub-efi #:bootloader-package #$(bootloader-package bootloader) #:bootcfg #$bootcfg-drv =2D-=20 2.13.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkdyg8ACgkQoqBt8qM6 VPrkvAgAuenYLoKSDjcX2kaAWLmKSs9hzU3D32oOWC5bHeEma9Oswa+8oCzgBrQ9 cYhXQY4F5j6WNDeLiI9oGH51twIo+HYb1S2uZQx6Ow9XEduWLKY4b7DvH0XuniaF MF+ITaV0nv6gMrLFIHDqFqij/gh8A0HprxeRTIUcw9n8iU33hY1Fm84UTezJRcnK g2Q77tsjP07CDmw/qGWnhBEp2xTniBuHlTuLB4okXwiBoQbSZ49e2RFq01KSbCZ1 Jwl17X2sXKC15g7hsrnWi/8U4eS3CivSImTRdQ0a6CGT4GsPr1G5aZ3OQvDOGPdo 9uMK80SIKdSyL003SYs4riVLscJ5ww== =2CXU -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu May 18 13:34:47 2017 Received: (at 26815) by debbugs.gnu.org; 18 May 2017 17:34:47 +0000 Received: from localhost ([127.0.0.1]:53734 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBPK2-0006sE-PS for submit@debbugs.gnu.org; Thu, 18 May 2017 13:34:47 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:43715) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBPK0-0006s6-Ku for 26815@debbugs.gnu.org; Thu, 18 May 2017 13:34:45 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 32B142372E; Thu, 18 May 2017 13:34:44 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Thu, 18 May 2017 13:34:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=Z+zDaUR3rL2h1R4z8NjI4W9oWG3hbB3Lsm/e4r3ew OQ=; b=AMUYcKPEvvmOCyDu5c2MGLfAF35A7eqfHSjxixOyYVkOLf3k7zZD9B2Rz hFr52DgdAofjS+bLYHvPHdRIDAW1xkQ86igW1vowxwe6hBdcpxuOaeBgRjO9kPaU mzKUKcFl7aQWzTKXEE5KuoDrJ9Riv9Nfjrq9eGCNUPPELCkvdCstRsdvznzXl/gM MmIK3FfTxmLJgokxrx9aK5NNme/8f8WhsbGpH/wOzHv8z/Z4/0mNhHjYt1Awg6gP TfcTG5Ee3ulgZqjUuc+YmKcwqX/7dnhFAZKPGsoTO+GzAS4n1sOkcWUP23ndGsQo F6R/AkPy5nZyU4g89I9B2+zM9ePAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=Z+zDaUR3rL2h1R4z8N jI4W9oWG3hbB3Lsm/e4r3ewOQ=; b=UqRamvTeIHxznWPOQ3Vk0g+oCQMoGvmgJH ppzOvZedYBrLX/J5xC3mKmlwV38keCqNGAvb6Obn7aa4Ln2gvWiHmGRzipJMxPbS s7tMSYsA92EZFgp4hGs3fQeJ81k9dSArMh3JiGvyhGgx+K/tfQj9vmT1GfPUS1Z/ 6YrFJsf8tDb21OMoIFmriqEwPk36XyTD9FfzN7KAL+3OJ5I+swy3vW2ydQwQhwf5 7UEdfqyIwYtZ7B/RvduBCGsIaaxUiunKAJUjb29+B+bpQJFR+bC0J5RXldmhqE/U OizDV2P1t6Y7RG5H+2Ish68sBWHAUxiPOESKwt0RRBKetij8I7kA== X-ME-Sender: X-Sasl-enc: V3UXLFWdULtx4j2DRxCYBA7aFBzQXPr1VyxBbEb/gPBY 1495128883 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id A32F47E7D3; Thu, 18 May 2017 13:34:43 -0400 (EDT) From: Marius Bakke To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#26815: [PATCH v4 3/3] vm: Add UEFI loader to disk images. In-Reply-To: <877f1ecf00.fsf@fastmail.com> References: <87r2zoygoi.fsf@gnu.org> <20170517110522.18106-1-mbakke@fastmail.com> <20170517110522.18106-3-mbakke@fastmail.com> <87ziebtbph.fsf@gnu.org> <877f1ecf00.fsf@fastmail.com> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Thu, 18 May 2017 19:34:42 +0200 Message-ID: <8737c2cbm5.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Marius Bakke writes: >> Once we=E2=80=99re done with that, we=E2=80=99ll have to update one of t= he >> =E2=80=98operating-system=E2=80=99 declaration examples to show UEFI con= figuration, and >> to update the doc to explain the installation process for UEFI. > > I'll get on that. Here is a start on UEFI documentation update. Not sure if it's okay to hijack the lightweight desktop template, or if it's better to have an example closer to the (GRUB Configuration) section. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-doc-Update-GRUB-EFI-instructions.patch Content-Transfer-Encoding: quoted-printable From=209db5b8acb017b8f283d36d09835f947879be4e30 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 18 May 2017 19:24:36 +0200 Subject: [PATCH] doc: Update GRUB EFI instructions. * doc/guix.texi (USB Stick Installation): Mention UEFI. (Preparing for Installation): Add note about EFI System Partition. (Proceeding with the Installation): Mention the GRUB-EFI package. (GRUB Configuration): Likewise. (Using the Configuration System): Hijack lightweight desktop to include UEF= I. * gnu/system/examples/lightweight-desktop.tmpl: Adjust native EFI configura= tion. =2D-- doc/guix.texi | 19 ++++++++++++++----- gnu/system/examples/lightweight-desktop.tmpl | 25 ++++++++++++++++--------- 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 72741e034..fb67ea50d 100644 =2D-- a/doc/guix.texi +++ b/doc/guix.texi @@ -7322,8 +7322,8 @@ Access to @file{/dev/sdX} usually requires root privi= leges. @end enumerate =20 Once this is done, you should be able to reboot the system and boot from =2Dthe USB stick. The latter usually requires you to get in the BIOS' boot =2Dmenu, where you can choose to boot from the USB stick. +the USB stick. The latter usually requires you to get in the BIOS' or +UEFI boot menu, where you can choose to boot from the USB stick. =20 @xref{Installing GuixSD in a VM}, if, instead, you would like to install GuixSD in a virtual machine (VM). @@ -7477,6 +7477,14 @@ install BIOS-based GRUB (which is the default), make= sure a BIOS Boot Partition is available (@pxref{BIOS installation,,, grub, GNU GRUB manual}). =20 +If you instead wish to use EFI-based grub, a FAT32 EFI System Partition +is required. This partition should be mounted at @file{/boot/efi} and +must have the @dfn{esp} flag set. E.g. for @command{parted}: + +@example +parted /dev/sda set 1 esp on +@end example + Once you are done partitioning the target hard disk drive, you have to create a file system on the relevant partition(s)@footnote{Currently GuixSD only supports ext4 and btrfs file systems. In particular, code @@ -7590,7 +7598,8 @@ in particular: @itemize @item Make sure the @code{grub-configuration} form refers to the device you =2Dwant to install GRUB on. +want to install GRUB on. You also need to specify the @code{grub-efi} +package if you wish to use native UEFI boot. =20 @item Be sure that your partition labels match the value of their respective @@ -7879,7 +7888,7 @@ management, power management, and more, would look li= ke this: @include os-config-desktop.texi @end lisp =20 =2DA graphical environment with a choice of lightweight window managers +A graphical UEFI system with a choice of lightweight window managers instead of full-blown desktop environments would look like this: =20 @lisp @@ -15277,7 +15286,7 @@ The number of seconds to wait for keyboard input be= fore booting. Set to The @code{grub-theme} object describing the theme to use. =20 @item @code{grub} (default: @code{grub}) =2DThe GRUB package to use. +The GRUB package to use. Currently either @code{grub} or @code{grub-efi}. =20 @item @code{terminal-outputs} (default: @code{'gfxterm}) The output terminals used for the GRUB boot menu, as a list of symbols. diff --git a/gnu/system/examples/lightweight-desktop.tmpl b/gnu/system/exam= ples/lightweight-desktop.tmpl index 389ec8574..ad92ad163 100644 =2D-- a/gnu/system/examples/lightweight-desktop.tmpl +++ b/gnu/system/examples/lightweight-desktop.tmpl @@ -4,7 +4,7 @@ =20 (use-modules (gnu) (gnu system nss)) (use-service-modules desktop) =2D(use-package-modules wm ratpoison certs suckless) +(use-package-modules bootloaders wm ratpoison certs suckless) =20 (operating-system (host-name "antelope") @@ -13,14 +13,21 @@ =20 ;; Assuming /dev/sdX is the target hard disk, and "my-root" ;; is the label of the target root file system. =2D (bootloader (grub-configuration (device "/dev/sdX"))) =2D =2D (file-systems (cons (file-system =2D (device "my-root") =2D (title 'label) =2D (mount-point "/") =2D (type "ext4")) =2D %base-file-systems)) + (bootloader (grub-configuration (grub grub-efi) + (device "/dev/sdX"))) + + (file-systems (cons* (file-system + (device "my-root") + (title 'label) + (mount-point "/") + (type "ext4")) + (file-system + ;; Specify partition here since FAT + ;; labels are currently unsupported. + (device "/dev/sdX1") + (mount-point "/boot/efi") + (type "vfat")) + %base-file-systems)) =20 (users (cons (user-account (name "alice") =2D-=20 2.13.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkd2zIACgkQoqBt8qM6 VPpSdggAhCGBo94FoIbw3MweaCdaOSQh3pEQn5ad7HbEA14vXAXGJ4NsjHbHf0Uu rH4unDUs0DoYszyBbWzmcUuXSLncUPBnU7zMSPecKg3zMFVp7af+bK7jrS3QWoSm 9VI24kVfpUHzDJ1CqCuk3/nyQ9dZVsGGXS1EiBz4+eKgevRaFvVEkm90Z3pZwTEw Ofd15byanB+aBa3oda/WnSkMZq0YCJeVMQ5ektz3lV98Iy0nfBNl9T/m5ciQ/YBT k2hfCI5vMflFtwfbnuUbNJSXyVTvGyGBuBrpZ/aVeV7tGBlI1a9lWHH8fBqahsf2 fo+rlPrduDhh08U0JmUpsvmxr7zuKQ== =gGd/ -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu May 18 16:50:39 2017 Received: (at 26815) by debbugs.gnu.org; 18 May 2017 20:50:39 +0000 Received: from localhost ([127.0.0.1]:53920 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBSNb-0006dk-4S for submit@debbugs.gnu.org; Thu, 18 May 2017 16:50:39 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58602) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBSNZ-0006dW-Cu for 26815@debbugs.gnu.org; Thu, 18 May 2017 16:50:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dBSNQ-0003GL-Bp for 26815@debbugs.gnu.org; Thu, 18 May 2017 16:50:32 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_20,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:58293) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dBSNQ-0003GG-8H; Thu, 18 May 2017 16:50:28 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:42914 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dBSNP-0002VM-Jp; Thu, 18 May 2017 16:50:28 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Marius Bakke Subject: Re: bug#26815: [PATCH v4 3/3] vm: Add UEFI loader to disk images. References: <87r2zoygoi.fsf@gnu.org> <20170517110522.18106-1-mbakke@fastmail.com> <20170517110522.18106-3-mbakke@fastmail.com> <87ziebtbph.fsf@gnu.org> <877f1ecf00.fsf@fastmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 29 =?utf-8?Q?Flor=C3=A9al?= an 225 de la =?utf-8?Q?R?= =?utf-8?Q?=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-unknown-linux-gnu Date: Thu, 18 May 2017 22:50:24 +0200 In-Reply-To: <877f1ecf00.fsf@fastmail.com> (Marius Bakke's message of "Thu, 18 May 2017 18:21:35 +0200") Message-ID: <87inkxanzj.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Marius Bakke skribis: > Ludovic Court=C3=A8s writes: [...] >> I thought we=E2=80=99d pass something like >> >> (initialize-hard-disk =E2=80=A6 #:grub-efi #$grub-eif) >> >> to avoid the ambiguity? > > Thanks for the hint. With the attached patch, grub-efi is now passed > through to "install-efi". I haven't tested it on "version-0.13.0" but > assume it will work. Awesome! > Now, I would like to instead implement an #:efi-loader keyword, and pass > it a derivation for the standalone EFI blob, but I'm not sure if I can > do that before the weekend. What do you think, is this "good enough" for > the time being? I think so. I=E2=80=99d like to push that release out. :-) >> Once we=E2=80=99re done with that, we=E2=80=99ll have to update one of t= he >> =E2=80=98operating-system=E2=80=99 declaration examples to show UEFI con= figuration, and >> to update the doc to explain the installation process for UEFI. > > I'll get on that. Cool. > From b2236aa915bfb32e974546790a1e87ef1b268403 Mon Sep 17 00:00:00 2001 > From: Marius Bakke > Date: Thu, 18 May 2017 18:10:31 +0200 > Subject: [PATCH] vm: Initialize-hard-disk now takes a grub-efi parameter. > > * gnu/build/vm.scm (initialize-hard-disk): Learn #:grub-efi. > (install-efi): Use it. > * gnu/system/vm.scm (qemu-image): Pass it. LGTM! I suppose you=E2=80=99d squash it with the initial patch? Thanks a lot! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Thu May 18 16:59:43 2017 Received: (at 26815) by debbugs.gnu.org; 18 May 2017 20:59:43 +0000 Received: from localhost ([127.0.0.1]:53926 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBSWN-0006r3-1z for submit@debbugs.gnu.org; Thu, 18 May 2017 16:59:43 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60553) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBSWK-0006qn-Lf for 26815@debbugs.gnu.org; Thu, 18 May 2017 16:59:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dBSWC-0005r8-6b for 26815@debbugs.gnu.org; Thu, 18 May 2017 16:59:35 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:58374) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dBSWC-0005r4-3L; Thu, 18 May 2017 16:59:32 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:42972 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dBSWB-00076s-Fa; Thu, 18 May 2017 16:59:31 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Marius Bakke Subject: Re: bug#26815: [PATCH v4 3/3] vm: Add UEFI loader to disk images. References: <87r2zoygoi.fsf@gnu.org> <20170517110522.18106-1-mbakke@fastmail.com> <20170517110522.18106-3-mbakke@fastmail.com> <87ziebtbph.fsf@gnu.org> <877f1ecf00.fsf@fastmail.com> <8737c2cbm5.fsf@fastmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 29 =?utf-8?Q?Flor=C3=A9al?= an 225 de la =?utf-8?Q?R?= =?utf-8?Q?=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-unknown-linux-gnu Date: Thu, 18 May 2017 22:59:28 +0200 In-Reply-To: <8737c2cbm5.fsf@fastmail.com> (Marius Bakke's message of "Thu, 18 May 2017 19:34:42 +0200") Message-ID: <871srlankf.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Marius Bakke skribis: > Here is a start on UEFI documentation update. Not sure if it's okay to > hijack the lightweight desktop template, or if it's better to have an > example closer to the (GRUB Configuration) section. I think it=E2=80=99s OK. > From 9db5b8acb017b8f283d36d09835f947879be4e30 Mon Sep 17 00:00:00 2001 > From: Marius Bakke > Date: Thu, 18 May 2017 19:24:36 +0200 > Subject: [PATCH] doc: Update GRUB EFI instructions. > > * doc/guix.texi (USB Stick Installation): Mention UEFI. > (Preparing for Installation): Add note about EFI System Partition. > (Proceeding with the Installation): Mention the GRUB-EFI package. > (GRUB Configuration): Likewise. > (Using the Configuration System): Hijack lightweight desktop to include U= EFI. > * gnu/system/examples/lightweight-desktop.tmpl: Adjust native EFI configu= ration. Great! Minor suggestions: > +If you instead wish to use EFI-based grub, a FAT32 EFI System Partition > +is required. This partition should be mounted at @file{/boot/efi} and > +must have the @dfn{esp} flag set. E.g. for @command{parted}: I would change this paragraph like this --8<---------------cut here---------------start------------->8--- @cindex EFI, installation @cindex UEFI, installation @cindex ESP, EFI system partition If you instead wish to use EFI-based GRUB, a FAT32 @dfn{EFI System Partitio= n} (ESP) is required. This partition should be mounted at @file{/boot/efi} and must have the @code{esp} flag set. E.g., for @command{parted}: --8<---------------cut here---------------end--------------->8--- > @item @code{grub} (default: @code{grub}) > -The GRUB package to use. > +The GRUB package to use. Currently either @code{grub} or @code{grub-efi= }. Maybe: --8<---------------cut here---------------start------------->8--- @cindex EFI, bootloader @cindex UEFI, bootloader @cindex BIOS, bootloader The GRUB package to use. Currently either @code{grub}, for ``legacy'' x86 BIOS systems, or @code{grub-efi}, for modern systems using the @dfn{Unified Extensible Firmware Interface} (UEFI). --8<---------------cut here---------------end--------------->8--- > ;; Assuming /dev/sdX is the target hard disk, and "my-root" > ;; is the label of the target root file system. > - (bootloader (grub-configuration (device "/dev/sdX"))) > - > - (file-systems (cons (file-system > - (device "my-root") > - (title 'label) > - (mount-point "/") > - (type "ext4")) > - %base-file-systems)) > + (bootloader (grub-configuration (grub grub-efi) > + (device "/dev/sdX"))) In the comment could you add that this is for a UEFI/EFI system? Thank you! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Thu May 18 18:52:34 2017 Received: (at 26815) by debbugs.gnu.org; 18 May 2017 22:52:34 +0000 Received: from localhost ([127.0.0.1]:54060 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBUHa-000181-EQ for submit@debbugs.gnu.org; Thu, 18 May 2017 18:52:34 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:41811) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBUHY-00017t-Cr for 26815@debbugs.gnu.org; Thu, 18 May 2017 18:52:33 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 4CC5420937; Thu, 18 May 2017 18:52:30 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Thu, 18 May 2017 18:52:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=SkVPIkXaK0K+Lh7gs30pUTDDkqyGfLD/ic3OrWtyX /0=; b=HWbOsJTwyIW6tCJeWDNkHbvsQnPaskos3JkFLHd9fWejHBhWeaXlj+dgx L1jLnDhKSnse+4pVzKLaQUZnSlInwmNFD5tpv7nVU7wJKHbAOW/WCs0iMtNcHH0S ZiZRgU/IXixMlt7w0fNoB7b6C4Q4ANYUSdIqBbZGZpQh3PpjFlbT9hEKpV00IQMv CZrsWHmd5pv4YsdwudnzZkDUJuV8QRrwNpDYcZLHtQTNswQiI651dv7bCXK03y3T 88wAprfEIpWs37iDhbPDnENCVUcYv9cv0tBNH7OMiWM50Ti5Gp7Mn+0NyRZHYjJ6 9UyCvVMFZFpMqm/j/5JjINqZYfWkg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=SkVPIkXaK0K+Lh7gs3 0pUTDDkqyGfLD/ic3OrWtyX/0=; b=Qni4di1vLu3QnHJ3O1BBiM2zB/fvebi4f+ oHmfweN5DBbC99LQDvdaCDcbWj9cxZc3UXu1O7nUcrJ6djpzMGw0OUz1TfF5PVGh DZm16TppYjCDrfhTKrvyc4VO6RjUWNz7A7v2VEJ6C+XSJlgk0xZpTbMUTVr6Zk69 URXnLu4xFcWM6l7+OBE0ERu0D0EunF5U5LeAb1i82cC6zmtuSF/xquLijzPZF1Ay OMbxUP+wbvZBV/46GjSBNfodKg9G6rocaApREFeG8/ZuaIQtmeBDasp/AJGKFjep 9qfnEfQ0ZZQpNolxHMKkrORFtIT5ct7K0MomUSZkjKUIdyBRuMYA== X-ME-Sender: X-Sasl-enc: A+ahRxFh47J6YhicSz31sNV/dH8BBNBZKbemN0YQqFpP 1495147949 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id D473A24767; Thu, 18 May 2017 18:52:29 -0400 (EDT) From: Marius Bakke To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#26815: [PATCH v4 3/3] vm: Add UEFI loader to disk images. In-Reply-To: <87inkxanzj.fsf@gnu.org> References: <87r2zoygoi.fsf@gnu.org> <20170517110522.18106-1-mbakke@fastmail.com> <20170517110522.18106-3-mbakke@fastmail.com> <87ziebtbph.fsf@gnu.org> <877f1ecf00.fsf@fastmail.com> <87inkxanzj.fsf@gnu.org> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Fri, 19 May 2017 00:52:28 +0200 Message-ID: <87y3ttbwwj.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: >> From b2236aa915bfb32e974546790a1e87ef1b268403 Mon Sep 17 00:00:00 2001 >> From: Marius Bakke >> Date: Thu, 18 May 2017 18:10:31 +0200 >> Subject: [PATCH] vm: Initialize-hard-disk now takes a grub-efi parameter. >> >> * gnu/build/vm.scm (initialize-hard-disk): Learn #:grub-efi. >> (install-efi): Use it. >> * gnu/system/vm.scm (qemu-image): Pass it. > > LGTM! I suppose you=E2=80=99d squash it with the initial patch? Indeed. Figured this was an easier review format, though. I'll push this series shortly, after some basic sanity checks. Thanks a lot for the great feedback! I'll work on a more Guixy way of creating the standalone GRUB image and also a system test for the next release ;-) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkeJawACgkQoqBt8qM6 VPrTUwf9EXtIwbMLY/ar6DpTtlGuifhFz3vzCevIHWVe7yHhXm1EegXBW278SKhC mxOmNkjS6iZQUg9/CxdufOsFsEYo0ZOzpuTbY228/3Rd4U21eLrkMdy44gsOefcd eQmnS4O4VIF6XFmeoFibExn/llLJsJHO3Cbh7lMDCvNYnB4VIkSAH5d7AaLN4hVh qpAFX4JLwUgxEMvDk2osfSi/ab+JGVU3bc/8d11OjkStzuf++zQ4g8EXtBeVIiRn svJrl7BNaxxDQ00m7rWF0lrUZaRpCVye6Rcs53CMpf25msUi+pFGV1EvayyRNHou C/5lBgfPbtnKzrAtLdIpL0TrtfoffA== =bWkL -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri May 19 03:00:25 2017 Received: (at 26815) by debbugs.gnu.org; 19 May 2017 07:00:25 +0000 Received: from localhost ([127.0.0.1]:54274 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBbth-0005xr-AN for submit@debbugs.gnu.org; Fri, 19 May 2017 03:00:25 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49795) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBbtf-0005xe-Ho for 26815@debbugs.gnu.org; Fri, 19 May 2017 03:00:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dBbtX-0000DS-55 for 26815@debbugs.gnu.org; Fri, 19 May 2017 03:00:18 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:39110) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dBbtX-0000DO-26; Fri, 19 May 2017 03:00:15 -0400 Received: from [193.50.110.84] (port=41620 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dBbtT-0005Ok-47; Fri, 19 May 2017 03:00:14 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Marius Bakke Subject: Re: bug#26815: [PATCH v4 3/3] vm: Add UEFI loader to disk images. References: <87r2zoygoi.fsf@gnu.org> <20170517110522.18106-1-mbakke@fastmail.com> <20170517110522.18106-3-mbakke@fastmail.com> <87ziebtbph.fsf@gnu.org> <877f1ecf00.fsf@fastmail.com> <87inkxanzj.fsf@gnu.org> <87y3ttbwwj.fsf@fastmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 30 =?utf-8?Q?Flor=C3=A9al?= an 225 de la =?utf-8?Q?R?= =?utf-8?Q?=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-unknown-linux-gnu Date: Fri, 19 May 2017 09:00:08 +0200 In-Reply-To: <87y3ttbwwj.fsf@fastmail.com> (Marius Bakke's message of "Fri, 19 May 2017 00:52:28 +0200") Message-ID: <87a869l4av.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 26815 Cc: 26815@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Marius Bakke skribis: > Ludovic Court=C3=A8s writes: > >>> From b2236aa915bfb32e974546790a1e87ef1b268403 Mon Sep 17 00:00:00 2001 >>> From: Marius Bakke >>> Date: Thu, 18 May 2017 18:10:31 +0200 >>> Subject: [PATCH] vm: Initialize-hard-disk now takes a grub-efi paramete= r. >>> >>> * gnu/build/vm.scm (initialize-hard-disk): Learn #:grub-efi. >>> (install-efi): Use it. >>> * gnu/system/vm.scm (qemu-image): Pass it. >> >> LGTM! I suppose you=E2=80=99d squash it with the initial patch? > > Indeed. Figured this was an easier review format, though. Definitely. > I'll push this series shortly, after some basic sanity checks. Thanks a > lot for the great feedback! I'll work on a more Guixy way of creating > the standalone GRUB image and also a system test for the next release ;-) Awesome, thank you! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Fri May 19 12:15:55 2017 Received: (at 26815-done) by debbugs.gnu.org; 19 May 2017 16:15:55 +0000 Received: from localhost ([127.0.0.1]:55549 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBkZH-0007Z2-CS for submit@debbugs.gnu.org; Fri, 19 May 2017 12:15:55 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:52015) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBkZF-0007Yv-PQ for 26815-done@debbugs.gnu.org; Fri, 19 May 2017 12:15:54 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 3F965208BC; Fri, 19 May 2017 12:15:53 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Fri, 19 May 2017 12:15:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=q7mQyvLZO3EXFTz4tEmZEwe/t5ypPjr+lEEpakmtw g0=; b=bOvPOydTrvMVDP4cvbvUxxUjBlpmytk9qpkDT8tzyUz8Ies2hXYJYkACU dxPZDkXv9KH0y4EnQ58kxYSO9wGCUHs5YWysBGyWQk0FXVwcLlrk9hP+TFL6Qsiy oGzSNwiQYuLzdDGUH2sY0/4iO6GfEWNoRr/ShzQ+Emmj33oI5GpNsTquw8cMBwwc zB+op9+6JFuVa9NaUwwPzya/zFFGkW7fPnjr0O4KRfD5pxvRO1wKrirInyKZa3KJ FxdPayxL4i07bBWr0SLReNvDqKSOYBtN2lGAQCkmFR88zkykb4iAbA7v2wX+D+tL exXRbrx+3laLI5SGW8BW9EbtQws3Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=q7mQyvLZO3EXFTz4tE mZEwe/t5ypPjr+lEEpakmtwg0=; b=BndRX/9Nf4gnwscwqxqVH3fO5hzCTRM38R Jiw8QGrrDFQgJtFLSAvA6M8bJT6yb/boRUHRILdWVMl2Bvt34nYoRimJfjZOLWoB qMgA5LJX3dyN7HHSzjBsrdBMOoO75ZFEMZbDSixoirw6EDIkUeM4yABxwn68YlbD Ws7nU6+MCVHFihBvM/OnUcFLeBRuCip7Er+OQI4zqYKKMsrfEPo+b7KaIX2EpsdE wnS+ODaUghTRh89YtHO+3narnJx6lMmUawUdrEqLl/5OGPfX5Uww1OrdlGxFcqEu zNjuYM+XLwGh7Sb/SHk4uY8rEg0NxkWjAXV+40IK2lTkcxYHMPGw== X-ME-Sender: X-Sasl-enc: ojiuiij8Z9GxtHdBE+S9KuMeArwFyBFJG5yaERISmQIk 1495210552 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 8770824752; Fri, 19 May 2017 12:15:52 -0400 (EDT) From: Marius Bakke To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#26815: [PATCH v4 3/3] vm: Add UEFI loader to disk images. In-Reply-To: <871srlankf.fsf@gnu.org> References: <87r2zoygoi.fsf@gnu.org> <20170517110522.18106-1-mbakke@fastmail.com> <20170517110522.18106-3-mbakke@fastmail.com> <87ziebtbph.fsf@gnu.org> <877f1ecf00.fsf@fastmail.com> <8737c2cbm5.fsf@fastmail.com> <871srlankf.fsf@gnu.org> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Fri, 19 May 2017 18:15:50 +0200 Message-ID: <87k25cvn49.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815-done Cc: 26815-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Marius Bakke skribis: > >> Here is a start on UEFI documentation update. Not sure if it's okay to >> hijack the lightweight desktop template, or if it's better to have an >> example closer to the (GRUB Configuration) section. > > I think it=E2=80=99s OK. > >> From 9db5b8acb017b8f283d36d09835f947879be4e30 Mon Sep 17 00:00:00 2001 >> From: Marius Bakke >> Date: Thu, 18 May 2017 19:24:36 +0200 >> Subject: [PATCH] doc: Update GRUB EFI instructions. >> >> * doc/guix.texi (USB Stick Installation): Mention UEFI. >> (Preparing for Installation): Add note about EFI System Partition. >> (Proceeding with the Installation): Mention the GRUB-EFI package. >> (GRUB Configuration): Likewise. >> (Using the Configuration System): Hijack lightweight desktop to include = UEFI. >> * gnu/system/examples/lightweight-desktop.tmpl: Adjust native EFI config= uration. > > Great! Minor suggestions: [...] Thanks again for the excellent feedback. I did an installation by "naively" following the manual and noticed that it does not mention mounting other partitions before `guix system init`. So, I added it. Pushed at last! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkfGjcACgkQoqBt8qM6 VPqeBAgA0XXGnUHfqcE5yQyZsHiJ3IzVyc4/hlZc6KOpcaMltwE0T6fBZojBtCK3 Z7d818WqzaUUx8r81uAZ+9gP+rCYlS8w3Vb57LP6WsT3MVP5jxbuJzhuQ9+wdnVz Op1yU9b0RZfA1cmDEBqa/vIK59NoEutMra4XdNxbJUeksrsP+0A7TQnbOVhnpute uxTqP2fDMHUZPoCsGR0l1kp7GqVHsJX1QPAakjuc+y+Fb+cFOfMZMlaEh+V5qL1p z5j1+J8O0N9svZHiPQElQUzvYuJR6sxwU3EUXQo2XzMQY4P/ocmC249/sv80io5q 5hwT9Jkry/17iG3cHbMDeBN1F4jPJg== =jAJE -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri May 19 13:37:41 2017 Received: (at 26815-done) by debbugs.gnu.org; 19 May 2017 17:37:41 +0000 Received: from localhost ([127.0.0.1]:55574 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBlqP-0000zd-8G for submit@debbugs.gnu.org; Fri, 19 May 2017 13:37:41 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:35339) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBlqO-0000zQ-Ar for 26815-done@debbugs.gnu.org; Fri, 19 May 2017 13:37:40 -0400 Received: by mail-wm0-f68.google.com with SMTP id v4so19619201wmb.2 for <26815-done@debbugs.gnu.org>; Fri, 19 May 2017 10:37:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version; bh=JAx0z/Up/gttnFr/MQYzA7NSrEi9Q46XKQz+BhfPa0o=; b=WiBTcDYAxqqnfGuHnbIu/yWinbNYjqGN8Y4IMt4H9N/KbYioNSGfCFX8wWzP88Eb4V hIzT7p9Tr3nKJcuK9KjdZivdLsVKp/5kbFzzQyHq23Yy8bQ26ljSmqz73QVPt00yaFve CA1F1ROuW39sSe5JEZ7An0xPCP17pqRyZZi7WHY3kzzCk+DPBtcSyjX7/vOdWcOC5t+Q MATl3qXaWFSrPfcxdZiDmAMrdBYzhsNBbGgpHbcTiXv3/TO8Eiv+EzHbLP9buKLk/l+7 e6XYFUEql5UaXpoGFs6n+VA/R3WjoMZUiBDb5pN7XOL6r+KSX1iP5virDo9+U5Gras/H /S9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version; bh=JAx0z/Up/gttnFr/MQYzA7NSrEi9Q46XKQz+BhfPa0o=; b=mG69H08vzmJxoTbI497h9n5UQ1TzeSrENJd57c7B8LM8Gh4+CQyLkVg3OayD09Fi1N lNEZnMiYV9BOjl22/8VLl5gtVnBpw427QN+SpYgVEn/csr5H/f6oGPaKaF28wYTdtg/y bVjjaBc9QiPVSz3D6TpsV2CnDcsZTJQo80ph9NnsLCwYlpYSgUTR4ryiAzcrUcC1xq5Y p9LCLr5XC3+alRaZU1XfbM9yWUwgrlOblMkdnFsZyVOusghZ6ihK6NVHZpIOp9580S1t cWzmCZP63KONfN3yY+umetz601omNlbzedCFhDQBPo4nkNOQhb2E92xkOm7cWmIa5Rd0 YVdA== X-Gm-Message-State: AODbwcAgTiSjFQu3PZxw22cOlVdwjcuZNiFXwQenaUT86h/bBehXEOIU kDHuGsYbA5vcvQ== X-Received: by 10.28.91.146 with SMTP id p140mr16951239wmb.120.1495215454559; Fri, 19 May 2017 10:37:34 -0700 (PDT) Received: from cervin (85-169-37-239.rev.numericable.fr. [85.169.37.239]) by smtp.gmail.com with ESMTPSA id s29sm2778418wrb.21.2017.05.19.10.37.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 May 2017 10:37:33 -0700 (PDT) References: <87r2zoygoi.fsf@gnu.org> <20170517110522.18106-1-mbakke@fastmail.com> <20170517110522.18106-3-mbakke@fastmail.com> <87ziebtbph.fsf@gnu.org> <877f1ecf00.fsf@fastmail.com> <8737c2cbm5.fsf@fastmail.com> <871srlankf.fsf@gnu.org> <87k25cvn49.fsf@fastmail.com> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Mathieu Othacehe To: Marius Bakke Subject: Re: bug#26815: [PATCH v4 3/3] vm: Add UEFI loader to disk images. In-reply-to: <87k25cvn49.fsf@fastmail.com> Date: Fri, 19 May 2017 19:37:33 +0200 Message-ID: <87pof4agte.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 26815-done Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= , 26815-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) Hi Marius, > Thanks again for the excellent feedback. I did an installation by > "naively" following the manual and noticed that it does not mention > mounting other partitions before `guix system init`. So, I added it. > > Pushed at last! Thanks for this serie ! As a follow-up, when things will calm down, you might consider moving some stuff in a grub-efi structure. For example the (when esp ...) snippet in initialize-hard-disk or the install-efi procedure. Mathieu From debbugs-submit-bounces@debbugs.gnu.org Fri May 19 14:07:02 2017 Received: (at 26815-done) by debbugs.gnu.org; 19 May 2017 18:07:02 +0000 Received: from localhost ([127.0.0.1]:55585 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBmIn-0001ho-NJ for submit@debbugs.gnu.org; Fri, 19 May 2017 14:07:01 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:46983) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBmIl-0001ha-Ni for 26815-done@debbugs.gnu.org; Fri, 19 May 2017 14:07:00 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 1749020BA7; Fri, 19 May 2017 14:06:58 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Fri, 19 May 2017 14:06:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=aROIxdHRUWExl/N59wz2QTkWy1ZSarimvck7EI5/m P0=; b=3BlrGA5EnWgrH5u0bylxMwjFebU3BOFQSa8H13d2ykGaXxmM2+CTZmudJ IsnO2ehullpN0HhskVGfENX2Mg8JVuA8gxqmg4St6SuT3HNJwQfuPPzGEGow2KNr +tu/odSgVjGbXq4w5TbApdy68Eq8XQgKCwml6lHfd1KAYYMqNBSNjiJbgkthKJb4 oa9hTxpsFTsJkrUSVmL2e0FWjzlNAHRqDpDyI0WtbovDDZpRc4SncwGjUmnIE+ST bskWf+XI2PA42rnHsjFvb4cln4nzELFFCBoWHiokRQp6jmOofVYa73h/aSaSYWdT FRUYMeWi1SjRAvRB7ZPTQ3D1f4IGg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=aROIxdHRUWExl/N59w z2QTkWy1ZSarimvck7EI5/mP0=; b=pI8QERXhpps8toQJmWkah1PCL0878VNOhD Rm027E8I2dgedBUYbLJs2OL22/a9xvbkOHXIpR21s21cXGTzBxBaWMzURQL25Ce9 jK+VJKl/AFdfztpiwv+IJ3/1M90rpjnPQSLsiMpAjV8CuqZkoYJatwnpSuRhbd8P Yigo8lbomtzI1kijXpPHyEKqhDjYk4Nx5cD7XX6znoLu+r2TnrTP3fhJpB71sQ2B +cVOifRhJpHweAVdSRSFNecq+S5mP7ukFpRgLlTsrZXWs7JourqqC6JyHAQZnc5m wS4HxuwwxB/XDB4MKMGoyUncqL4kceevC7Ezx2e6y9hq1nnPhIxg== X-ME-Sender: X-Sasl-enc: 1XqcVJO7vB4OZtt0kfOvUSrsyJjxlYUK931MxcH3iEmM 1495217218 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 6E44F2478C; Fri, 19 May 2017 14:06:58 -0400 (EDT) From: Marius Bakke To: Mathieu Othacehe Subject: Re: bug#26815: [PATCH v4 3/3] vm: Add UEFI loader to disk images. In-Reply-To: <87pof4agte.fsf@gmail.com> References: <87r2zoygoi.fsf@gnu.org> <20170517110522.18106-1-mbakke@fastmail.com> <20170517110522.18106-3-mbakke@fastmail.com> <87ziebtbph.fsf@gnu.org> <877f1ecf00.fsf@fastmail.com> <8737c2cbm5.fsf@fastmail.com> <871srlankf.fsf@gnu.org> <87k25cvn49.fsf@fastmail.com> <87pof4agte.fsf@gmail.com> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Fri, 19 May 2017 20:06:56 +0200 Message-ID: <87h90gvhz3.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815-done Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= , 26815-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Mathieu Othacehe writes: > Hi Marius, > >> Thanks again for the excellent feedback. I did an installation by >> "naively" following the manual and noticed that it does not mention >> mounting other partitions before `guix system init`. So, I added it. >> >> Pushed at last! > > Thanks for this serie ! > > As a follow-up, when things will calm down, you might consider moving > some stuff in a grub-efi structure. I plan to make a generic "grub-standalone" variant. Will try to fit it into the new bootloader API. The regular grub-efi variant won't cut it because it can't update EFI variables on the target system, so we need the "self-contained" grub snapshot generated by grub-mkstandalone(1). Also, the normal configuration file doesn't work with it, but a minimal config that loads the real one at boot is okay. Not sure why! > For example the (when esp ...) snippet in initialize-hard-disk or the > install-efi procedure. Here, I plan on implementing an #:efi-loader keyword that is passed a gexp for the generated EFI firmware image, instead of the current approach that passes #:grub-efi and builds it outside the store. On a related topic: The "device" field for grub-efi is a noop; `grub-install` looks for "/boot/efi" only (or "--efi-directory"). Currently the example uses the ESP for "device", but it should not have to be set. Not sure what to do about it, ideas? --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkfNEAACgkQoqBt8qM6 VPoI2gf6Ausl5pOO3kn0aRXYW7lK2F3aJdZPnnQnOLFWXBMMH/byHLOeAizwo7li VUj0eAH1355O4SRYHKnTFgHiaaiP0E2vTZLoKZDuFfAc3TOqS0ZoS559/mHAzZjt a5qCtxNvJHpQVxUDeW0FemwOIHkyod0X3uzLvLsFXDMZl3JFPFhIINdVDr6OzGSG 93VkKp7vMhx33IyHNl+Ur60IfEhmRRgLH0xV85fU1GX6KgFmYedz3ATGY17BkmC/ 1VLt/x5Cf15E3KAgq0x8NVHQ/88/CrduCZNk1DlPPCsKQ2pGseACzWF0utsA1BNl yabJc9BogkK8YhLgUgidtUAgcN1J2Q== =wC6W -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri May 19 17:21:16 2017 Received: (at 26815-done) by debbugs.gnu.org; 19 May 2017 21:21:16 +0000 Received: from localhost ([127.0.0.1]:55677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBpKm-0006GQ-54 for submit@debbugs.gnu.org; Fri, 19 May 2017 17:21:16 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33324) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBpKk-0006GD-0l for 26815-done@debbugs.gnu.org; Fri, 19 May 2017 17:21:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dBpKa-00083M-2n for 26815-done@debbugs.gnu.org; Fri, 19 May 2017 17:21:08 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:36739) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dBpKZ-00083H-Oa; Fri, 19 May 2017 17:21:03 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:49046 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dBpKZ-0005bn-22; Fri, 19 May 2017 17:21:03 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Marius Bakke Subject: Re: bug#26815: [PATCH v4 3/3] vm: Add UEFI loader to disk images. References: <87r2zoygoi.fsf@gnu.org> <20170517110522.18106-1-mbakke@fastmail.com> <20170517110522.18106-3-mbakke@fastmail.com> <87ziebtbph.fsf@gnu.org> <877f1ecf00.fsf@fastmail.com> <8737c2cbm5.fsf@fastmail.com> <871srlankf.fsf@gnu.org> <87k25cvn49.fsf@fastmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 30 =?utf-8?Q?Flor=C3=A9al?= an 225 de la =?utf-8?Q?R?= =?utf-8?Q?=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-unknown-linux-gnu Date: Fri, 19 May 2017 23:21:01 +0200 In-Reply-To: <87k25cvn49.fsf@fastmail.com> (Marius Bakke's message of "Fri, 19 May 2017 18:15:50 +0200") Message-ID: <874lwga6gy.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 26815-done Cc: 26815-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Marius Bakke skribis: > Ludovic Court=C3=A8s writes: > >> Marius Bakke skribis: >> >>> Here is a start on UEFI documentation update. Not sure if it's okay to >>> hijack the lightweight desktop template, or if it's better to have an >>> example closer to the (GRUB Configuration) section. >> >> I think it=E2=80=99s OK. >> >>> From 9db5b8acb017b8f283d36d09835f947879be4e30 Mon Sep 17 00:00:00 2001 >>> From: Marius Bakke >>> Date: Thu, 18 May 2017 19:24:36 +0200 >>> Subject: [PATCH] doc: Update GRUB EFI instructions. >>> >>> * doc/guix.texi (USB Stick Installation): Mention UEFI. >>> (Preparing for Installation): Add note about EFI System Partition. >>> (Proceeding with the Installation): Mention the GRUB-EFI package. >>> (GRUB Configuration): Likewise. >>> (Using the Configuration System): Hijack lightweight desktop to include= UEFI. >>> * gnu/system/examples/lightweight-desktop.tmpl: Adjust native EFI confi= guration. >> >> Great! Minor suggestions: > > [...] > > Thanks again for the excellent feedback. I did an installation by > "naively" following the manual and noticed that it does not mention > mounting other partitions before `guix system init`. So, I added it. Wonderful, thanks for testing the installation procedure! So modulo the Guile-SSH bug, we should be all set for the release=E2=80=A6 Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sat May 20 04:25:34 2017 Received: (at 26815-done) by debbugs.gnu.org; 20 May 2017 08:25:34 +0000 Received: from localhost ([127.0.0.1]:55888 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBzhe-0001NF-3A for submit@debbugs.gnu.org; Sat, 20 May 2017 04:25:34 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44151) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBzhc-0001N2-7c for 26815-done@debbugs.gnu.org; Sat, 20 May 2017 04:25:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dBzhR-0002bF-Pl for 26815-done@debbugs.gnu.org; Sat, 20 May 2017 04:25:26 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:46479) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dBzhR-0002bA-MQ; Sat, 20 May 2017 04:25:21 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:49392 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dBzhQ-0008Ka-PD; Sat, 20 May 2017 04:25:21 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Marius Bakke Subject: Re: bug#26815: [PATCH v4 3/3] vm: Add UEFI loader to disk images. References: <87r2zoygoi.fsf@gnu.org> <20170517110522.18106-1-mbakke@fastmail.com> <20170517110522.18106-3-mbakke@fastmail.com> <87ziebtbph.fsf@gnu.org> <877f1ecf00.fsf@fastmail.com> <8737c2cbm5.fsf@fastmail.com> <871srlankf.fsf@gnu.org> <87k25cvn49.fsf@fastmail.com> <87pof4agte.fsf@gmail.com> <87h90gvhz3.fsf@fastmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 1 Prairial an 225 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-unknown-linux-gnu Date: Sat, 20 May 2017 10:25:18 +0200 In-Reply-To: <87h90gvhz3.fsf@fastmail.com> (Marius Bakke's message of "Fri, 19 May 2017 20:06:56 +0200") Message-ID: <87h90g7x5d.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 26815-done Cc: Mathieu Othacehe , 26815-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Hi Marius, I=E2=80=99m unable to cherry-pick ecf5d5376979fadd971559367bf553df89fcc62b = to =E2=80=98version-0.13.0=E2=80=99 because there are conflicts and I=E2=80=99= m not sure how to resolve them. Could you take a look? TIA! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sat May 20 04:55:22 2017 Received: (at 26815-done) by debbugs.gnu.org; 20 May 2017 08:55:22 +0000 Received: from localhost ([127.0.0.1]:55893 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dC0AU-00021N-J0 for submit@debbugs.gnu.org; Sat, 20 May 2017 04:55:22 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:35976) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dC0AS-00021B-JN for 26815-done@debbugs.gnu.org; Sat, 20 May 2017 04:55:20 -0400 Received: by mail-wr0-f194.google.com with SMTP id v42so4689550wrc.3 for <26815-done@debbugs.gnu.org>; Sat, 20 May 2017 01:55:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version:content-transfer-encoding; bh=//ghq+6oU3hezI4KuLHwHDgOqhsCuwhNvn751/fK0BU=; b=eNcp19M4KKUGvWwPfBbsKOREM6Mld0aMH9NbbZYccdeNqDGTGN9mDDYQUHGoFfQUtb mWUl76KWTOz3QdjtaMPrXDpA8bEf7k5sSYPvE7JHuOROxd+W2YiqbTD42v/Jq6TrB3uB bkZMQj82FF9gd7DQ+sSXEJGPoK1vVtO7XG9j1Lyb4LgCvjTFvo5/JBw0vkuLDqW/TQQC vrD7owt2lPCzu0s1hD4nbCOX6NBZDYYa+76UtO91qAMxOa1LwPeHPvw4pA9pizvhnaX6 +Uu2cW9NtWbNDqUaZV+Es8PTIHY0+6x/435x/x6pTouSjsq0xDRKAFU9q8iDMkXERIUB +DqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version:content-transfer-encoding; bh=//ghq+6oU3hezI4KuLHwHDgOqhsCuwhNvn751/fK0BU=; b=rrrKTAqZM50VLOcmSv1aUK52NxhuSgj0XmOJNkRBn6mD3zua2WTSvxVvA6dgFU+Qj3 zUXLC2vApPy725O/9bc2KvYHbfBWIzWi6UQTnIsIOIRrjdo8Jox30qhuQHNwBF7QuFSi xyljHwV2eUtegxW2YEoAp3P9OjEi7KWEMx+eGEs7Vw+TC0jHBlNLSUJgQQalFLHncCdh k2X9Vlhod4MYZkEbo8fzhAcOFYm5TfAZ5jvvpFndDZlA33aYbTczAyim7uKZqNIV4TGG 8MJY75lvnQH5bLAVnqEw4HEUqigdgn5xpF4UYW4UwQVaRfuNuTw8tc1hxXdObctOVjFr hDWw== X-Gm-Message-State: AODbwcCtrfw1M1frMPJGMaZvcMxwliJ0bOEl7vYDs3whWlzOBDG5BPBi ZFwEIy2WGaWZTA== X-Received: by 10.223.153.116 with SMTP id x107mr5500856wrb.55.1495270514630; Sat, 20 May 2017 01:55:14 -0700 (PDT) Received: from cervin (85-169-37-239.rev.numericable.fr. [85.169.37.239]) by smtp.gmail.com with ESMTPSA id l81sm26569110wmi.22.2017.05.20.01.55.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 20 May 2017 01:55:13 -0700 (PDT) References: <87r2zoygoi.fsf@gnu.org> <20170517110522.18106-1-mbakke@fastmail.com> <20170517110522.18106-3-mbakke@fastmail.com> <87ziebtbph.fsf@gnu.org> <877f1ecf00.fsf@fastmail.com> <8737c2cbm5.fsf@fastmail.com> <871srlankf.fsf@gnu.org> <87k25cvn49.fsf@fastmail.com> <87pof4agte.fsf@gmail.com> <87h90gvhz3.fsf@fastmail.com> <87h90g7x5d.fsf@gnu.org> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Mathieu Othacehe To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#26815: [PATCH v4 3/3] vm: Add UEFI loader to disk images. In-reply-to: <87h90g7x5d.fsf@gnu.org> Date: Sat, 20 May 2017 10:55:12 +0200 Message-ID: <87efvj3o27.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 26815-done Cc: Marius Bakke , 26815-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hi ! > I’m unable to cherry-pick ecf5d5376979fadd971559367bf553df89fcc62b to > ‘version-0.13.0’ because there are conflicts and I’m not sure how to > resolve them. I just had a look, the following conflict : --8<---------------cut here---------------start------------->8--- <<<<<<< HEAD #:grub.cfg #$grub-configuration) ======= #:grub-efi #$grub-efi #:bootloader-package #$(bootloader-package bootloader) #:bootcfg #$bootcfg-drv #:bootcfg-location #$(bootloader-configuration-file bootloader) #:bootloader-installer #$(bootloader-installer bootloader)) >>>>>>> ecf5d5376... vm: Add UEFI loader to disk images. --8<---------------cut here---------------end--------------->8--- means that patches b09a8da4a..5641dffb0 are required here. As I agree it is not a good idea to take them into 0.13 release, the only solution left is to rewrite Marius patch on top of a pre-bootloader rework commit. Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat May 20 05:23:08 2017 Received: (at 26815-done) by debbugs.gnu.org; 20 May 2017 09:23:08 +0000 Received: from localhost ([127.0.0.1]:55923 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dC0bM-0002fU-O9 for submit@debbugs.gnu.org; Sat, 20 May 2017 05:23:08 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:51123) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dC0bK-0002fK-Ke for 26815-done@debbugs.gnu.org; Sat, 20 May 2017 05:23:07 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 276932086F; Sat, 20 May 2017 05:23:06 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Sat, 20 May 2017 05:23:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=AquwLG2yTguwsaf5LDMy4Hygs+1QC8BPsL3LP0NsA /4=; b=U50gJs1iq3MKNYMFMsO/H7UKBkgJarUohX99xgAZhRX3gP4ILtJo+XpM0 /wWBrqmyjY+EL7hvwEDjCqfsuF9OTS1oHNp556K+hfqZtAF5OSyCPPsIV0N1CwHY AejeL0g0d86aIKIptwTrt6uim3sNz+qMdbNTVvTMVhWpG1q7gkSTxcAe0iEduGfS WmGKVaiyiyqGfrp9iK5KhPwO3AYmZijWowePrENafbv98nKvFwfKH0JRPC29gsEu yCSzNyjx+zsD8Dnz2/6sZ77B7rbHaINdnXcELUljDLrAZexoYbCagcZioSjCE6ly UhL5zRhkwcvKtSnlBxIZOtwBSHvBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=AquwLG2yTguwsaf5LD My4Hygs+1QC8BPsL3LP0NsA/4=; b=RDIYycYkNW18qd/sRZxTGulSST0CH6iZmH g+ZZFYgznV50Bjoup9Wg20JcN86N6kAcKHKLLLCUbFfeLDHO+HZHY9TxDRDY9ok4 lTbBo1S0nnYMsa0BcuxoaADVl3BeupvNQAST9IaiZ2wp3FomUQ1xZ6zdM0iQ49ig KViBg+pT7NIVSXvmJkchc27cuc/uf/APmyKydEOYwKse9WtcAmiIrRJ21SPXXAGi rCYFOm7IxviRCysoKnU7cXzCcfiHcgTKt+z9MmQs+0BFpfavezIYR/peDKZK6Hgr rHT4vqq4K3v30U3jCsjSTQ0PvhleHSVjr/Y6nnklp4FWc7jBRW5w== X-ME-Sender: X-Sasl-enc: Ula64McaIb/mJALWsW8eFOsIZ99pBpxoxiu5nRGIegsx 1495272185 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id A48D17E6E5; Sat, 20 May 2017 05:23:05 -0400 (EDT) From: Marius Bakke To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#26815: [PATCH v4 3/3] vm: Add UEFI loader to disk images. In-Reply-To: <87h90g7x5d.fsf@gnu.org> References: <87r2zoygoi.fsf@gnu.org> <20170517110522.18106-1-mbakke@fastmail.com> <20170517110522.18106-3-mbakke@fastmail.com> <87ziebtbph.fsf@gnu.org> <877f1ecf00.fsf@fastmail.com> <8737c2cbm5.fsf@fastmail.com> <871srlankf.fsf@gnu.org> <87k25cvn49.fsf@fastmail.com> <87pof4agte.fsf@gmail.com> <87h90gvhz3.fsf@fastmail.com> <87h90g7x5d.fsf@gnu.org> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Sat, 20 May 2017 11:23:04 +0200 Message-ID: <87tw4fg9vr.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815-done Cc: Mathieu Othacehe , 26815-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Hi Marius, > > I=E2=80=99m unable to cherry-pick ecf5d5376979fadd971559367bf553df89fcc62= b to > =E2=80=98version-0.13.0=E2=80=99 because there are conflicts and I=E2=80= =99m not sure how to > resolve them. > > Could you take a look? I resolved the conflicts, booted a UEFI VM, and pushed the commit. Still works! \o/ --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkgCvgACgkQoqBt8qM6 VPpdTwgAxhCtDK65mCOyXzwcDX9zajRa1eE76s9MMhUfE462q/5ujLfmV/lkrWJ8 kXXyKHOQuJXWSKXrkq9CFO+RdEuVWpcr/vFjfq0up2rjsDs9QQLNTeMuuygoB7v+ HR144WTflmYPV62DCf7ECO77qY87ndHA/Um2kfG+PwHPptalP+F/QIzAAb42DhaQ kFzwO8E3TM2eOU7//gAAe2TNE3qH0uVt7FSuF/VhWTS306g8VH0p1kTiKRrWbrf7 ZaF8RwIvZIt0gfFGhxVyrj1xYiAHxsRB1aIDpbJWykxp1W48DrcGC7fCaF0uT7ks Co3u7m0N8c/ySW6cmqLfB1pZ642fQA== =XspY -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 20 05:37:05 2017 Received: (at 26815-done) by debbugs.gnu.org; 20 May 2017 09:37:05 +0000 Received: from localhost ([127.0.0.1]:55988 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dC0oq-00030D-Pg for submit@debbugs.gnu.org; Sat, 20 May 2017 05:37:04 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:33253) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dC0op-0002zl-NA for 26815-done@debbugs.gnu.org; Sat, 20 May 2017 05:37:04 -0400 Received: by mail-wm0-f66.google.com with SMTP id b84so6448777wmh.0 for <26815-done@debbugs.gnu.org>; Sat, 20 May 2017 02:37:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version; bh=ExE7soo9qWeucPU2Fpmhwv0BS+aV5wB1mDwLUtlN9UI=; b=VJWbIvVF9ZP3EjlugbOZU5xO5ZAEI2RukG7aqA/afLuKcN4KWclxfMjUIINvOckCFM XIhFfhsv0RBvzGdC04rZq7FceSkq+UHZ8evJbWnNQmjMz9ElNeCsAcZWsjf0sUV8ou4m LzvZDpRPtt0tAYsPHiKKNuvStEID+f3BArTDfmBOqgO2QLIJTxi+Wxj2/8of9Sd2Ffyj 6J2vdVSTAOXlFyFuTej/rfmM3+r6OBQaTUWhBlCUXtVx9ES8GKsQNRw0+Zw7dvISt/9A 4joGwqDSHdSNZsIlDtxVhY0dVQLNYOB614JmLXE8m4zrEg6vtRqyyUxLEFXw44SN9XFv 3g5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version; bh=ExE7soo9qWeucPU2Fpmhwv0BS+aV5wB1mDwLUtlN9UI=; b=im/lByRc/m8kzo6CpCMjcX9VsK0SosAkyD7qpgtWWFWViCIazoAzMJhk5i31eiidZ/ eX+3orOdauB1nFZ3QYrwoLfFzJ9C9Tqgszy8eiwCelOmiDapHJe1X8M8koz4DZD2ghov RhzWakyrW3EtELvfEcCSVJkOfBgua6GJtV6WAX8OSGrPC3o1TON0lOzMpuUN3uubAiBW noD3JXldPTr4Hli0cuiqBLsF/va8S/dtv+EFKLiHH6pVriCAvyZQC+3Ns9bbOROYh/9f +eeqDLX7aT1BZjco/0L3mQtGs6cBWZRdFhY9uBZuFDxfv4YlYY47lxR5grQBUcN+P5G0 L0yg== X-Gm-Message-State: AODbwcDHpISMUav4E7epBW/rmp/Bf/xoeMmLezJsTJ1xrfzfOWIyZvnH LBjB14AHGNYNBA== X-Received: by 10.28.238.67 with SMTP id m64mr19838565wmh.57.1495273018100; Sat, 20 May 2017 02:36:58 -0700 (PDT) Received: from cervin (85-169-37-239.rev.numericable.fr. [85.169.37.239]) by smtp.gmail.com with ESMTPSA id l18sm10601308wmd.11.2017.05.20.02.36.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 20 May 2017 02:36:57 -0700 (PDT) References: <87r2zoygoi.fsf@gnu.org> <20170517110522.18106-1-mbakke@fastmail.com> <20170517110522.18106-3-mbakke@fastmail.com> <87ziebtbph.fsf@gnu.org> <877f1ecf00.fsf@fastmail.com> <8737c2cbm5.fsf@fastmail.com> <871srlankf.fsf@gnu.org> <87k25cvn49.fsf@fastmail.com> <87pof4agte.fsf@gmail.com> <87h90gvhz3.fsf@fastmail.com> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Mathieu Othacehe To: Marius Bakke Subject: Re: bug#26815: [PATCH v4 3/3] vm: Add UEFI loader to disk images. In-reply-to: <87h90gvhz3.fsf@fastmail.com> Date: Sat, 20 May 2017 11:36:56 +0200 Message-ID: <87a8673m4n.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 26815-done Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= , 26815-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) Hi Marius, > I plan to make a generic "grub-standalone" variant. Will try to fit it > into the new bootloader API. The regular grub-efi variant won't cut it > because it can't update EFI variables on the target system, so we need > the "self-contained" grub snapshot generated by grub-mkstandalone(1). > > Also, the normal configuration file doesn't work with it, but a minimal > config that loads the real one at boot is okay. Not sure why! Ok, but don't we need to do it on system reconfigure too ? > >> For example the (when esp ...) snippet in initialize-hard-disk or the >> install-efi procedure. > > Here, I plan on implementing an #:efi-loader keyword that is passed a > gexp for the generated EFI firmware image, instead of the current > approach that passes #:grub-efi and builds it outside the store. Great ! > > On a related topic: The "device" field for grub-efi is a noop; > `grub-install` looks for "/boot/efi" only (or "--efi-directory"). > Currently the example uses the ESP for "device", but it should not have > to be set. Not sure what to do about it, ideas? The "device" field of defaults to #f so maybe you can skip it ? Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat May 20 05:37:13 2017 Received: (at 26815-done) by debbugs.gnu.org; 20 May 2017 09:37:13 +0000 Received: from localhost ([127.0.0.1]:55991 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dC0oz-00030Z-0F for submit@debbugs.gnu.org; Sat, 20 May 2017 05:37:13 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52233) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dC0ox-00030M-UO for 26815-done@debbugs.gnu.org; Sat, 20 May 2017 05:37:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dC0oo-0007H7-39 for 26815-done@debbugs.gnu.org; Sat, 20 May 2017 05:37:06 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:46908) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dC0on-0007H3-Vh; Sat, 20 May 2017 05:37:02 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:49450 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dC0on-0003sv-69; Sat, 20 May 2017 05:37:01 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Marius Bakke Subject: Re: bug#26815: [PATCH v4 3/3] vm: Add UEFI loader to disk images. References: <87r2zoygoi.fsf@gnu.org> <20170517110522.18106-1-mbakke@fastmail.com> <20170517110522.18106-3-mbakke@fastmail.com> <87ziebtbph.fsf@gnu.org> <877f1ecf00.fsf@fastmail.com> <8737c2cbm5.fsf@fastmail.com> <871srlankf.fsf@gnu.org> <87k25cvn49.fsf@fastmail.com> <87pof4agte.fsf@gmail.com> <87h90gvhz3.fsf@fastmail.com> <87h90g7x5d.fsf@gnu.org> <87tw4fg9vr.fsf@fastmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 1 Prairial an 225 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-unknown-linux-gnu Date: Sat, 20 May 2017 11:36:58 +0200 In-Reply-To: <87tw4fg9vr.fsf@fastmail.com> (Marius Bakke's message of "Sat, 20 May 2017 11:23:04 +0200") Message-ID: <87zie77ttx.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 26815-done Cc: Mathieu Othacehe , 26815-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Marius Bakke skribis: > Ludovic Court=C3=A8s writes: > >> Hi Marius, >> >> I=E2=80=99m unable to cherry-pick ecf5d5376979fadd971559367bf553df89fcc6= 2b to >> =E2=80=98version-0.13.0=E2=80=99 because there are conflicts and I=E2=80= =99m not sure how to >> resolve them. >> >> Could you take a look? > > I resolved the conflicts, booted a UEFI VM, and pushed the commit. > > Still works! \o/ Awesome, thanks for the super-fast reply! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sat May 20 06:05:45 2017 Received: (at 26815-done) by debbugs.gnu.org; 20 May 2017 10:05:45 +0000 Received: from localhost ([127.0.0.1]:56030 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dC1Gb-0003gN-E8 for submit@debbugs.gnu.org; Sat, 20 May 2017 06:05:45 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:59101) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dC1GZ-0003gG-Uw for 26815-done@debbugs.gnu.org; Sat, 20 May 2017 06:05:44 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id B862A20FF9; Sat, 20 May 2017 06:05:43 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Sat, 20 May 2017 06:05:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=WNU9JD99A2t0Hogw8YTdH8s6deqb84ghnICX7ramQ u8=; b=M7cXKOo329I3NnAWBhHBIfFWaZg3wegx1AyIiDr4El4tl0rHwN3ilwvau CNgcosVtPgbqw+jDRb6j+gMy4tu3yvhgJrVuBW7tsS506xBfuDGsrJRPtb5QBfbE w55QwlHjMoOv+iZ9sLTuvmI9H13F4fmmmzAcJd296sKpx9LJzC0nINdaj+CZQ+xT m/6EvCEHQjeZpwnI4U+6Yfd/ASuNJoG1bCeGxYzfeR4a+fqEWOv0/+5QP0M4Rg4/ 9aYZEzLWP9LpfVj9nEnDXMS8HHEjt0YCNqk+PKzcrP3DrcVTwSWt9kGmecAo76vc JZW9fGlOGpO8LnYu/4qO+ygZbfUOw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=WNU9JD99A2t0Hogw8Y TdH8s6deqb84ghnICX7ramQu8=; b=LeRRHihozPF1CN+s8Xeh1k2QBofyCgSEfE iMfn7iiX6Fr5aXgcFr5sDct7kE/UviO780weBJX7vZNSKYjkIjdM2m0CQvKBKGeN wjrF91XfVXxJQLv+WyOG6RjMEPmJfiSeEbe2X/AgKvupR47IYSQZDefALTxCX5OB Ygg9RadiMM6rRbGnR/tbiS3cdkAcNTv3WkDGp/idnptGj6SukkGTU7dVZJLRRMaW GISUkKv1VKnn6swrmp0axCbRo4MOP/wCaW49S/wwp7RNbjbuZobsKoIz/1v9WRSC yLGV9tAtMLS8X/RDqT2eA/r0qgeFbO2nd2PLE05AQiGndziWLCYA== X-ME-Sender: X-Sasl-enc: kTo/mCmQD+pZmH7a8xbLuxYuNBab7CKoLWzm/EW1ipwt 1495274743 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 3F6ED7E6E5; Sat, 20 May 2017 06:05:43 -0400 (EDT) From: Marius Bakke To: Mathieu Othacehe Subject: Re: bug#26815: [PATCH v4 3/3] vm: Add UEFI loader to disk images. In-Reply-To: <87a8673m4n.fsf@gmail.com> References: <87r2zoygoi.fsf@gnu.org> <20170517110522.18106-1-mbakke@fastmail.com> <20170517110522.18106-3-mbakke@fastmail.com> <87ziebtbph.fsf@gnu.org> <877f1ecf00.fsf@fastmail.com> <8737c2cbm5.fsf@fastmail.com> <871srlankf.fsf@gnu.org> <87k25cvn49.fsf@fastmail.com> <87pof4agte.fsf@gmail.com> <87h90gvhz3.fsf@fastmail.com> <87a8673m4n.fsf@gmail.com> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Sat, 20 May 2017 12:05:41 +0200 Message-ID: <87r2zjg7wq.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26815-done Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= , 26815-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Mathieu Othacehe writes: > Hi Marius, > >> I plan to make a generic "grub-standalone" variant. Will try to fit it >> into the new bootloader API. The regular grub-efi variant won't cut it >> because it can't update EFI variables on the target system, so we need >> the "self-contained" grub snapshot generated by grub-mkstandalone(1). >> >> Also, the normal configuration file doesn't work with it, but a minimal >> config that loads the real one at boot is okay. Not sure why! > > Ok, but don't we need to do it on system reconfigure too ? Using "grub-mkstandalone" as an everyday bootloader is not a priority, though it would be nice to support that too. It doesn't make much sense to use that instead of "grub-efi" on a native system, but it can also generate e.g. standalone PXE, u-boot and yeelong loaders. >> On a related topic: The "device" field for grub-efi is a noop; >> `grub-install` looks for "/boot/efi" only (or "--efi-directory"). >> Currently the example uses the ESP for "device", but it should not have >> to be set. Not sure what to do about it, ideas? > > The "device" field of defaults to #f so maybe you can skip > it ? I tried that, but the "install-grub" procedure refused to function without a device argument. Will probably have to implement an "install-grub-efi" procedure, didn't look much into it yet. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkgFPUACgkQoqBt8qM6 VPo9HAf+NnkkGI5Tx6fh9mADSM+uRPlkS6LxoFoXPA1GEz25SYQfxhGJyHRriId+ ZFqiVeCBqbinBZBZVGUhDPVkzZ42Ad8r5WXhADHIhgrPEHFkUflHiZtv152L+0sY 6WKIL5S0U/jXUnmQjguEHlBTlacXdbV7Lmhd3cWuATdXutb0nS5TUy9MKfO0hg0F yGfc1+At2kW5PivGboFhw1TIKUpsnzrEWF9QSGmxxftyflaUZkycIZ8CFmoFpP0S 8ooqBB/6X71AnqLrg6jo7pApbNDZctZx5GSFswkQQ+zR49jgfksJ2nsPeX6NhMnS ARvFK0ZIVWui91ef7a57TBacZ2LFNg== =vQLv -----END PGP SIGNATURE----- --=-=-=-- From unknown Thu Jul 31 07:48:29 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 17 Jun 2017 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator