From: Pavel Shlyak <p.shlyak@pantherx.org>
To: Mathieu Othacehe <othacehe@gnu.org>
Cc: 55663@debbugs.gnu.org
Subject: [bug#55663] [PATCH] Image API: add FAT32 support
Date: Mon, 30 May 2022 12:01:27 +0300 [thread overview]
Message-ID: <CABF5CFF-255F-4515-AF1D-6B8A8CE5210F@pantherx.org> (raw)
In-Reply-To: <874k17ld1d.fsf_-_@gnu.org>
[-- Attachment #1: 0001-guix-Image-API-support-FAT32-partitions.patch --]
[-- Type: application/octet-stream, Size: 3800 bytes --]
From 5ff7fcf80196111ab8d5f87a1d159ed0349153b4 Mon Sep 17 00:00:00 2001
From: Pavel Shlyak <p.shlyak@pantherx.org>
Date: Thu, 26 May 2022 21:00:51 +0300
Subject: [PATCH] guix: Image API: support FAT32 partitions
* gnu/build/image.scm (make-vfat-image): pass fs bits as argument and force 1kb logical sector size only if "ESP" flag is set.
(make-partition-image): add "fat32" partition type, support explicit "fat16" type with vfat alias.
* gnu/system/image.scm (partition->dos-type partition): return file system IDs for "fat16" and "fat32" partitions.
(partition->gpt-type partition): ditto.
---
gnu/build/image.scm | 24 ++++++++++++++----------
gnu/system/image.scm | 8 ++++++--
2 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/gnu/build/image.scm b/gnu/build/image.scm
index 3e8b94e2d6..ddfd34c111 100644
--- a/gnu/build/image.scm
+++ b/gnu/build/image.scm
@@ -95,16 +95,18 @@ (define* (make-ext-image partition target root
(estimate-partition-size root)
size)))))))
-(define* (make-vfat-image partition target root)
+(define* (make-vfat-image partition target root fs-bits)
"Handle the creation of VFAT partition images. See 'make-partition-image'."
(let ((size (partition-size partition))
- (label (partition-label partition)))
- (invoke "fakeroot" "mkdosfs" "-n" label "-C" target
- "-F" "16" "-S" "1024"
- (size-in-kib
- (if (eq? size 'guess)
- (estimate-partition-size root)
- size)))
+ (label (partition-label partition))
+ (flags (partition-flags partition)))
+ (apply invoke "fakeroot" "mkdosfs" "-n" label "-C" target
+ "-F" (number->string fs-bits)
+ (size-in-kib
+ (if (eq? size 'guess)
+ (estimate-partition-size root)
+ size))
+ (if (member 'esp flags) (list "-S" "1024") '()))
(for-each (lambda (file)
(unless (member file '("." ".."))
(invoke "mcopy" "-bsp" "-i" target
@@ -120,8 +122,10 @@ (define* (make-partition-image partition-sexp target root)
(cond
((string-prefix? "ext" type)
(make-ext-image partition target root))
- ((string=? type "vfat")
- (make-vfat-image partition target root))
+ ((or (string=? type "vfat") (string=? type "fat16"))
+ (make-vfat-image partition target root 16))
+ ((string=? type "fat32")
+ (make-vfat-image partition target root 32))
(else
(raise (condition
(&message
diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index dd32e58c2d..f02f6e0b8c 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -312,7 +312,9 @@ (define (partition->dos-type partition)
(cond
((member 'esp flags) "0xEF")
((string-prefix? "ext" file-system) "0x83")
- ((string=? file-system "vfat") "0x0E")
+ ((or (string=? file-system "vfat")
+ (string=? file-system "fat16")) "0x0E")
+ ((string=? file-system "fat32") "0x0C")
(else
(raise (condition
(&message
@@ -329,7 +331,9 @@ (define (partition->gpt-type partition)
(cond
((member 'esp flags) "U")
((string-prefix? "ext" file-system) "L")
- ((string=? file-system "vfat") "F")
+ ((or (string=? file-system "vfat")
+ (string=? file-system "fat16")
+ (string=? file-system "fat32")) "F")
(else
(raise (condition
(&message
--
2.32.1 (Apple Git-133)
[-- Attachment #2: Type: text/plain, Size: 930 bytes --]
> 30 мая 2022 г., в 10:01, Mathieu Othacehe <othacehe@gnu.org> написал(а):
>
>
> Hello Pavel,
>
>> gnu/build/image.scm | 24 ++++++++++++++----------
>> gnu/system/image.scm | 9 +++++++--
>
> Please write a commit message following the guidelines available here:
> https://guix.gnu.org/manual/en/html_node/Submitting-Patches.html
>
>> +(define* (make-vfat-image partition target root fs_bits)
>
> s/fs_bits/fs-bits/
>
>> + ((or (string=? file-system "vfat") (string=? file-system "fat16")) "0x0E")
>
> This line is longer than 78 characters you can break it between the two
> strings comparisons.
>
>> + (
>> + (or (string=? file-system "vfat")
>
> Merge those two lines.
>
>> + (string=? file-system "fat32")
>> + ) "F")
>
> Ditto.
>
> Can you please send a v2?
>
> Thanks for your contribution,
>
> Mathieu
next prev parent reply other threads:[~2022-05-30 9:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-26 18:02 [bug#55663] [PATCH] Image API: add FAT32 support Pavel Shlyak
2022-05-26 18:07 ` Tobias Geerinckx-Rice via Guix-patches via
2022-05-26 20:54 ` Pavel Shlyak
2022-05-29 11:46 ` Pavel Shlyak
2022-05-29 14:35 ` Pavel Shlyak
2022-05-30 7:01 ` Mathieu Othacehe
2022-05-30 9:01 ` Pavel Shlyak [this message]
2022-05-31 13:07 ` bug#55663: " Mathieu Othacehe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CABF5CFF-255F-4515-AF1D-6B8A8CE5210F@pantherx.org \
--to=p.shlyak@pantherx.org \
--cc=55663@debbugs.gnu.org \
--cc=othacehe@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.