* bug#55406: GUIX Image API: wrong fs type and flag
@ 2022-05-13 21:46 Pavel Shlyak
2022-05-15 17:00 ` Pavel Shlyak
` (4 more replies)
0 siblings, 5 replies; 9+ messages in thread
From: Pavel Shlyak @ 2022-05-13 21:46 UTC (permalink / raw)
To: 55406
I have a scheme code like
(define rpi-boot-partition
(partition
(size (* 128 (expt 2 20)))
(label "BOOT")
(file-system "vfat")
(flags '())
(initializer (gexp initialize-efi-partition))))
(define rpi-root-partition
(partition
(size 'guess)
(label "RASPIROOT")
(file-system "ext4")
(flags '(boot))
(initializer (gexp initialize-root-partition))))
(define raspberry-pi-image
(image
(format 'disk-image)
(partitions (list rpi-boot-partition rpi-root-partition))))
The output is like that:
$ fdisk -l /gnu/store/hnsfs5a161f5hvymg7ar541qrml62yvv-raspberry-pi-barebones-raw-image
Device Boot Start End Sectors Size Id Type
/gnu/store/hnsfs5a161f5hvymg7ar541qrml62yvv-raspberry-pi-barebones-raw-image1 1 262144 262144 128M 83 Linux
/gnu/store/hnsfs5a161f5hvymg7ar541qrml62yvv-raspberry-pi-barebones-raw-image2 262145 3583688 3321544 1.6G 83 Linux
No boot flag is set on the first partition. The file system seems to be incorrect (ext* instead of vfat)
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#55406: GUIX Image API: wrong fs type and flag
2022-05-13 21:46 bug#55406: GUIX Image API: wrong fs type and flag Pavel Shlyak
@ 2022-05-15 17:00 ` Pavel Shlyak
2022-05-15 17:11 ` Pavel Shlyak
` (3 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Pavel Shlyak @ 2022-05-15 17:00 UTC (permalink / raw)
To: 55406
It looks like setting esp flag with (flags '(esp)) also sets file system to vfat. However,
1. I still cannot resolve boot flag issue
2. I do not need that flag and I’d be glad getting correct partition without it
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#55406: GUIX Image API: wrong fs type and flag
2022-05-13 21:46 bug#55406: GUIX Image API: wrong fs type and flag Pavel Shlyak
2022-05-15 17:00 ` Pavel Shlyak
@ 2022-05-15 17:11 ` Pavel Shlyak
2022-05-20 17:01 ` bug#55406: WIP: Image API support for fat16 partitions Pavel Shlyak
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Pavel Shlyak @ 2022-05-15 17:11 UTC (permalink / raw)
To: 55406
[-- Attachment #1: Type: text/plain, Size: 705 bytes --]
I found it. It blows my mind. Let me just cry out here.
(define (partition->dos-type partition)
;; Return the MBR partition type corresponding to the given PARTITION.
;; See: https://en.wikipedia.org/wiki/Partition_type.
(let ((flags (partition-flags partition)))
(cond
((member 'esp flags) "0xEF")
(else "0x83"))))
(define (partition->gpt-type partition)
;; Return the genimage GPT partition type code corresponding to PARTITION.
;; See https://github.com/pengutronix/genimage/blob/master/README.rst
(let ((flags (partition-flags partition)))
(cond
((member 'esp flags) "U")
(else "L"))))
[-- Attachment #2: Type: text/html, Size: 2796 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#55406: WIP: Image API support for fat16 partitions
2022-05-13 21:46 bug#55406: GUIX Image API: wrong fs type and flag Pavel Shlyak
2022-05-15 17:00 ` Pavel Shlyak
2022-05-15 17:11 ` Pavel Shlyak
@ 2022-05-20 17:01 ` Pavel Shlyak
2022-05-20 19:54 ` Pavel Shlyak
2022-05-21 13:09 ` bug#55406: Patch to handle boot flag in Image API Pavel Shlyak
4 siblings, 0 replies; 9+ messages in thread
From: Pavel Shlyak @ 2022-05-20 17:01 UTC (permalink / raw)
To: 55406
[-- Attachment #1: Type: text/plain, Size: 227 bytes --]
I have written a small patch to partially fix the issue. Flags are still not set. GPT is still not fixed. There’s no need to return file systems that are not supported in make-partition-image function in gnu/build/image.scm
[-- Attachment #2: mbr-support-vfat-partitions.patch --]
[-- Type: application/octet-stream, Size: 1027 bytes --]
diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index 42e215f614..a83f844682 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -304,10 +304,15 @@ (define (format->image-type format)
(define (partition->dos-type partition)
;; Return the MBR partition type corresponding to the given PARTITION.
;; See: https://en.wikipedia.org/wiki/Partition_type.
- (let ((flags (partition-flags partition)))
+ (let ((flags (partition-flags partition)) (file-system (partition-file-system partition)))
(cond
- ((member 'esp flags) "0xEF")
- (else "0x83"))))
+ ((member 'esp flags) "0xEF")
+ ((string-prefix? "ext" file-system) "0x83")
+ ((string=? file-system "vfat") "0x0E")
+ (else
+ (raise (condition
+ (&message
+ (message "unsupported partition type"))))))))
(define (partition->gpt-type partition)
;; Return the genimage GPT partition type code corresponding to PARTITION.
^ permalink raw reply related [flat|nested] 9+ messages in thread
* bug#55406: WIP: Image API support for fat16 partitions
2022-05-13 21:46 bug#55406: GUIX Image API: wrong fs type and flag Pavel Shlyak
` (2 preceding siblings ...)
2022-05-20 17:01 ` bug#55406: WIP: Image API support for fat16 partitions Pavel Shlyak
@ 2022-05-20 19:54 ` Pavel Shlyak
2022-05-21 13:09 ` bug#55406: Patch to handle boot flag in Image API Pavel Shlyak
4 siblings, 0 replies; 9+ messages in thread
From: Pavel Shlyak @ 2022-05-20 19:54 UTC (permalink / raw)
To: 55406
[-- Attachment #1: Type: text/plain, Size: 108 bytes --]
This patch fixes GPT support for fat partitions. Should be applied after gpt-support-vfat-partitions.patch
[-- Attachment #2: gpt-support-vfat-partitions.patch --]
[-- Type: application/octet-stream, Size: 991 bytes --]
diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index a83f844682..a6267feab2 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -317,10 +317,15 @@ (define (partition->dos-type partition)
(define (partition->gpt-type partition)
;; Return the genimage GPT partition type code corresponding to PARTITION.
;; See https://github.com/pengutronix/genimage/blob/master/README.rst
- (let ((flags (partition-flags partition)))
+ (let ((flags (partition-flags partition)) (file-system (partition-file-system partition)))
(cond
((member 'esp flags) "U")
- (else "L"))))
+ ((string-prefix? "ext" file-system) "L")
+ ((string=? file-system "vfat") "F")
+ (else
+ (raise (condition
+ (&message
+ (message "unsupported partition type"))))))))
(define (partition-image partition)
;; Return as a file-like object, an image of the given PARTITION. A
^ permalink raw reply related [flat|nested] 9+ messages in thread
* bug#55406: Patch to handle boot flag in Image API
2022-05-13 21:46 bug#55406: GUIX Image API: wrong fs type and flag Pavel Shlyak
` (3 preceding siblings ...)
2022-05-20 19:54 ` Pavel Shlyak
@ 2022-05-21 13:09 ` Pavel Shlyak
2022-05-22 13:33 ` bug#55406: GUIX Image API: wrong fs type and flag Mathieu Othacehe
4 siblings, 1 reply; 9+ messages in thread
From: Pavel Shlyak @ 2022-05-21 13:09 UTC (permalink / raw)
To: 55406
[-- Attachment #1: Type: text/plain, Size: 256 bytes --]
Here’s the last patch in the set that adds support for the boot flag. It should be merged after mbr-support-vfat-partitions.patch and gpt-support-vfat-partitions.patch
The issue can be closed as soon as all three patches are merged.
Have a nice day!
[-- Attachment #2: support-bootable-partitions.patch --]
[-- Type: application/octet-stream, Size: 2641 bytes --]
cdiff --git a/gnu/build/image.scm b/gnu/build/image.scm
index 81caa424f8..321fba40e3 100644
--- a/gnu/build/image.scm
+++ b/gnu/build/image.scm
@@ -48,12 +48,13 @@ (define (sexp->partition sexp)
"Take SEXP, a tuple as returned by 'partition->gexp', and turn it into a
<partition> record."
(match sexp
- ((size file-system file-system-options label uuid)
+ ((size file-system file-system-options label uuid flags)
(partition (size size)
(file-system file-system)
(file-system-options file-system-options)
(label label)
- (uuid uuid)))))
+ (uuid uuid)
+ (flags flags)))))
(define (size-in-kib size)
"Convert SIZE expressed in bytes, to kilobytes and return it as a string."
@@ -78,6 +79,7 @@ (define* (make-ext-image partition target root
(fs-options (partition-file-system-options partition))
(label (partition-label partition))
(uuid (partition-uuid partition))
+ (flags (partition-flags partition))
(journal-options "lazy_itable_init=1,lazy_journal_init=1"))
(apply invoke
`("fakeroot" "mke2fs" "-t" ,fs "-d" ,root
diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index a6267feab2..d903cb4579 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -218,7 +218,8 @@ (define (partition->gexp partition)
#$(partition-file-system-options partition)
#$(partition-label partition)
#$(and=> (partition-uuid partition)
- uuid-bytevector)))
+ uuid-bytevector)
+ #$(partition-flags partition)))
(define gcrypt-sqlite3&co
;; Guile-Gcrypt, Guile-SQLite3, and their propagated inputs.
@@ -392,17 +393,21 @@ (define (partition->config image partition)
(partition-type-values image partition)))
(let ((label (partition-label partition))
(image (partition-image partition))
- (offset (partition-offset partition)))
+ (offset (partition-offset partition))
+ (bootable (if (member 'boot (partition-flags partition))
+ "true" "false" )))
#~(format #f "~/partition ~a {
~/~/~a = ~a
~/~/image = \"~a\"
~/~/offset = \"~a\"
+ ~/~/bootable = \"~a\"
~/}"
#$label
#$partition-type-attribute
#$partition-type-value
#$image
- #$offset))))
+ #$offset
+ #$bootable))))
(define (genimage-type-options image-type image)
(cond
^ permalink raw reply related [flat|nested] 9+ messages in thread
* bug#55406: GUIX Image API: wrong fs type and flag
2022-05-21 13:09 ` bug#55406: Patch to handle boot flag in Image API Pavel Shlyak
@ 2022-05-22 13:33 ` Mathieu Othacehe
2022-05-22 14:02 ` bug#55406: [PATCH] GUIX Image API support for vfat and boot flag Pavel Shlyak
0 siblings, 1 reply; 9+ messages in thread
From: Mathieu Othacehe @ 2022-05-22 13:33 UTC (permalink / raw)
To: Pavel Shlyak; +Cc: 55406
Hello Pavel,
> Here’s the last patch in the set that adds support for the boot
> flag. It should be merged after mbr-support-vfat-partitions.patch and
> gpt-support-vfat-partitions.patch The issue can be closed as soon as
> all three patches are merged. Have a nice day!
Thanks for those three patches. At first sight, they look fine :) It
would be great if you could resend them using "git format-patch",
following the guidelines available here:
https://guix.gnu.org/manual/en/html_node/Submitting-Patches.html.
Could you also add your copyright on top of the edited files?
Mathieu
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#55406: [PATCH] GUIX Image API support for vfat and boot flag
2022-05-22 13:33 ` bug#55406: GUIX Image API: wrong fs type and flag Mathieu Othacehe
@ 2022-05-22 14:02 ` Pavel Shlyak
2022-05-23 8:30 ` bug#55406: GUIX Image API: wrong fs type and flag Mathieu Othacehe
0 siblings, 1 reply; 9+ messages in thread
From: Pavel Shlyak @ 2022-05-22 14:02 UTC (permalink / raw)
To: Mathieu Othacehe; +Cc: 55406, guix-patches
[-- Attachment #1: Type: text/plain, Size: 30 bytes --]
Ok, I tried to format them :)
[-- Attachment #2: 0001-Image-API-support-VFAT-partitions-in-MBR.patch --]
[-- Type: application/octet-stream, Size: 1399 bytes --]
From ec65ce70cfb26a9936099cdb0d1a156a747fa42b Mon Sep 17 00:00:00 2001
From: Pavel Shlyak <p.shlyak@pantherx.org>
Date: Sun, 22 May 2022 16:52:45 +0300
Subject: [PATCH 1/4] Image API: support VFAT partitions in MBR
---
gnu/system/image.scm | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index 42e215f614..a83f844682 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -304,10 +304,15 @@ (define (format->image-type format)
(define (partition->dos-type partition)
;; Return the MBR partition type corresponding to the given PARTITION.
;; See: https://en.wikipedia.org/wiki/Partition_type.
- (let ((flags (partition-flags partition)))
+ (let ((flags (partition-flags partition)) (file-system (partition-file-system partition)))
(cond
- ((member 'esp flags) "0xEF")
- (else "0x83"))))
+ ((member 'esp flags) "0xEF")
+ ((string-prefix? "ext" file-system) "0x83")
+ ((string=? file-system "vfat") "0x0E")
+ (else
+ (raise (condition
+ (&message
+ (message "unsupported partition type"))))))))
(define (partition->gpt-type partition)
;; Return the genimage GPT partition type code corresponding to PARTITION.
--
2.32.1 (Apple Git-133)
[-- Attachment #3: 0002-Image-API-support-VFAT-partitions-in-GPT.patch --]
[-- Type: application/octet-stream, Size: 1359 bytes --]
From 87dd32f21450c4f84c55f6afc11ba1979e201ec9 Mon Sep 17 00:00:00 2001
From: Pavel Shlyak <p.shlyak@pantherx.org>
Date: Sun, 22 May 2022 16:53:30 +0300
Subject: [PATCH 2/4] Image API: support VFAT partitions in GPT
---
gnu/system/image.scm | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index a83f844682..a6267feab2 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -317,10 +317,15 @@ (define (partition->dos-type partition)
(define (partition->gpt-type partition)
;; Return the genimage GPT partition type code corresponding to PARTITION.
;; See https://github.com/pengutronix/genimage/blob/master/README.rst
- (let ((flags (partition-flags partition)))
+ (let ((flags (partition-flags partition)) (file-system (partition-file-system partition)))
(cond
((member 'esp flags) "U")
- (else "L"))))
+ ((string-prefix? "ext" file-system) "L")
+ ((string=? file-system "vfat") "F")
+ (else
+ (raise (condition
+ (&message
+ (message "unsupported partition type"))))))))
(define (partition-image partition)
;; Return as a file-like object, an image of the given PARTITION. A
--
2.32.1 (Apple Git-133)
[-- Attachment #4: 0003-Image-API-support-boot-flag.patch --]
[-- Type: application/octet-stream, Size: 3079 bytes --]
From 62980309a32ca1ecc5547345bdbc706d42c59d3b Mon Sep 17 00:00:00 2001
From: Pavel Shlyak <p.shlyak@pantherx.org>
Date: Sun, 22 May 2022 16:53:49 +0300
Subject: [PATCH 3/4] Image API: support boot flag
---
gnu/build/image.scm | 6 ++++--
gnu/system/image.scm | 11 ++++++++---
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/gnu/build/image.scm b/gnu/build/image.scm
index 81caa424f8..321fba40e3 100644
--- a/gnu/build/image.scm
+++ b/gnu/build/image.scm
@@ -48,12 +48,13 @@ (define (sexp->partition sexp)
"Take SEXP, a tuple as returned by 'partition->gexp', and turn it into a
<partition> record."
(match sexp
- ((size file-system file-system-options label uuid)
+ ((size file-system file-system-options label uuid flags)
(partition (size size)
(file-system file-system)
(file-system-options file-system-options)
(label label)
- (uuid uuid)))))
+ (uuid uuid)
+ (flags flags)))))
(define (size-in-kib size)
"Convert SIZE expressed in bytes, to kilobytes and return it as a string."
@@ -78,6 +79,7 @@ (define* (make-ext-image partition target root
(fs-options (partition-file-system-options partition))
(label (partition-label partition))
(uuid (partition-uuid partition))
+ (flags (partition-flags partition))
(journal-options "lazy_itable_init=1,lazy_journal_init=1"))
(apply invoke
`("fakeroot" "mke2fs" "-t" ,fs "-d" ,root
diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index a6267feab2..d903cb4579 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -218,7 +218,8 @@ (define (partition->gexp partition)
#$(partition-file-system-options partition)
#$(partition-label partition)
#$(and=> (partition-uuid partition)
- uuid-bytevector)))
+ uuid-bytevector)
+ #$(partition-flags partition)))
(define gcrypt-sqlite3&co
;; Guile-Gcrypt, Guile-SQLite3, and their propagated inputs.
@@ -392,17 +393,21 @@ (define (partition->config image partition)
(partition-type-values image partition)))
(let ((label (partition-label partition))
(image (partition-image partition))
- (offset (partition-offset partition)))
+ (offset (partition-offset partition))
+ (bootable (if (member 'boot (partition-flags partition))
+ "true" "false" )))
#~(format #f "~/partition ~a {
~/~/~a = ~a
~/~/image = \"~a\"
~/~/offset = \"~a\"
+ ~/~/bootable = \"~a\"
~/}"
#$label
#$partition-type-attribute
#$partition-type-value
#$image
- #$offset))))
+ #$offset
+ #$bootable))))
(define (genimage-type-options image-type image)
(cond
--
2.32.1 (Apple Git-133)
[-- Attachment #5: 0004-Update-copyright.patch --]
[-- Type: application/octet-stream, Size: 1266 bytes --]
From e8d8130a3c06c43715879d5d74ded2fa8e57dd2e Mon Sep 17 00:00:00 2001
From: Pavel Shlyak <p.shlyak@pantherx.org>
Date: Sun, 22 May 2022 16:58:22 +0300
Subject: [PATCH 4/4] Update copyright
---
gnu/build/image.scm | 1 +
gnu/system/image.scm | 1 +
2 files changed, 2 insertions(+)
diff --git a/gnu/build/image.scm b/gnu/build/image.scm
index 321fba40e3..3e8b94e2d6 100644
--- a/gnu/build/image.scm
+++ b/gnu/build/image.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020, 2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
+;;; Copyright © 2022 Pavel Shlyak <p.shlyak@pantherx.org>
;;;
;;; This file is part of GNU Guix.
;;;
diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index d903cb4579..e1eecabc33 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020, 2021 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2022 Pavel Shlyak <p.shlyak@pantherx.org>
;;;
;;; This file is part of GNU Guix.
;;;
--
2.32.1 (Apple Git-133)
^ permalink raw reply related [flat|nested] 9+ messages in thread
* bug#55406: GUIX Image API: wrong fs type and flag
2022-05-22 14:02 ` bug#55406: [PATCH] GUIX Image API support for vfat and boot flag Pavel Shlyak
@ 2022-05-23 8:30 ` Mathieu Othacehe
0 siblings, 0 replies; 9+ messages in thread
From: Mathieu Othacehe @ 2022-05-23 8:30 UTC (permalink / raw)
To: Pavel Shlyak; +Cc: 55406-done
Hello Pavel,
> Ok, I tried to format them :)
Thanks, I added commit messages following our guidelines, fixed the
indentation and a few other small details.
Pushed on master!
Mathieu
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-05-23 8:32 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-13 21:46 bug#55406: GUIX Image API: wrong fs type and flag Pavel Shlyak
2022-05-15 17:00 ` Pavel Shlyak
2022-05-15 17:11 ` Pavel Shlyak
2022-05-20 17:01 ` bug#55406: WIP: Image API support for fat16 partitions Pavel Shlyak
2022-05-20 19:54 ` Pavel Shlyak
2022-05-21 13:09 ` bug#55406: Patch to handle boot flag in Image API Pavel Shlyak
2022-05-22 13:33 ` bug#55406: GUIX Image API: wrong fs type and flag Mathieu Othacehe
2022-05-22 14:02 ` bug#55406: [PATCH] GUIX Image API support for vfat and boot flag Pavel Shlyak
2022-05-23 8:30 ` bug#55406: GUIX Image API: wrong fs type and flag Mathieu Othacehe
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.