mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-18 21:46:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

image: Add support for btrfs.

Browse source 
* gnu/build/image.scm (make-btrfs-image): New variable.
* gnu/system/image.scm (system-disk-image): Support btrfs.

Change-Id: I80a5b52ec478ce5927d6208e324cbb70282c647a
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Roman Scherer 2024-10-03 14:13:32 +02:00 committed by Ludovic Courtès
parent 727a72c5e2
commit 886b410e6f
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
3 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/guix.texi
View file

@ -48340,7 +48340,7 @@ there is no offset applied.
The partition file system as a string, defaulting to @code{"ext4"}.
The supported values are @code{"vfat"}, @code{"fat16"}, @code{"fat32"},
and @code{"ext4"}.
@code{"btrfs"}, and @code{"ext4"}.
@code{"vfat"}, @code{"fat16"}, and @code{"fat32"} partitions without the
@code{'esp} flag are by default LBA compatible.

19
gnu/build/image.scm
View file

@ -73,6 +73,23 @@ (define (estimate-partition-size root)
(max (ash 1 20)
(* 1.25 (file-size root))))
(define* (make-btrfs-image partition target root)
"Handle the creation of BTRFS partition images. See
'make-partition-image'."
(let ((size (partition-size partition))
(fs-options (partition-file-system-options partition))
(label (partition-label partition))
(uuid (partition-uuid partition)))
(apply invoke
`("fakeroot" "mkfs.btrfs" "-r" ,root
"-L" ,label
,@(if uuid
`("-U" ,(uuid->string uuid))
'())
"--shrink"
,@fs-options
,target))))
(define* (make-ext-image partition target root
#:key
(owner-uid 0)
@ -141,6 +158,8 @@ (define* (make-partition-image partition-sexp target root)
(let* ((partition (sexp->partition partition-sexp))
(type (partition-file-system partition)))
(cond
((string=? "btrfs" type)
(make-btrfs-image partition target root))
((string-prefix? "ext" type)
(make-ext-image partition target root))
((or (string=? type "vfat") (string=? type "fat16"))

8
gnu/system/image.scm
View file

@ -402,7 +402,8 @@ (define (partition->dos-type partition)
(file-system (partition-file-system partition)))
(cond
((member 'esp flags) "0xEF")
((string-prefix? "ext" file-system) "0x83")
((or (string=? file-system "btrfs")
(string-prefix? "ext" file-system)) "0x83")
((or (string=? file-system "vfat")
(string=? file-system "fat16")) "0x0E")
((string=? file-system "fat32") "0x0C")
@ -421,7 +422,8 @@ (define (partition->gpt-type partition)
(file-system (partition-file-system partition)))
(cond
((member 'esp flags) "U")
((string-prefix? "ext" file-system) "L")
((or (string=? file-system "btrfs")
(string-prefix? "ext" file-system)) "L")
((or (string=? file-system "vfat")
(string=? file-system "fat16")
(string=? file-system "fat32")) "F")
@ -453,6 +455,8 @@ (define (partition-image partition)
(let ((initializer (or #$(partition-initializer partition)
initialize-root-partition))
(inputs '#+(cond
((string=? type "btrfs")
(list btrfs-progs fakeroot))
((string-prefix? "ext" type)
(list e2fsprogs fakeroot))
((or (string=? type "vfat")