diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2020-05-26 16:25:25 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2020-05-26 17:16:42 +0200 |
| commit | bd3716f6fee127562935d86ff7f641197366769c (patch) | |
| tree | 5d3dbf901fa407d28f06f5e30557f99ee0c568da /gnu/build | |
| parent | 6ac7526e488ad3dd73080d1c00efe2066b1bf0a2 (diff) | |
| download | guix-bd3716f6fee127562935d86ff7f641197366769c.tar guix-bd3716f6fee127562935d86ff7f641197366769c.tar.gz | |
image: Add partition file-system options support.
* gnu/image.scm (<partition>)[file-system-options]: New field,
(partition-file-system-options): new exported procedure.
* gnu/system/image.scm (partition->gexp): Adapt accordingly.
* gnu/build/image.scm (sexp->partition): Also adapt accordingly,
(make-ext-image): and pass file-system options to mke2fs.
Diffstat (limited to 'gnu/build')
| -rw-r--r-- | gnu/build/image.scm | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/gnu/build/image.scm b/gnu/build/image.scm index 23fc56571f..b37ea9332a 100644 --- a/gnu/build/image.scm +++ b/gnu/build/image.scm @@ -47,9 +47,10 @@ "Take SEXP, a tuple as returned by 'partition->gexp', and turn it into a <partition> record." (match sexp - ((size file-system label uuid) + ((size file-system file-system-options label uuid) (partition (size size) (file-system file-system) + (file-system-options file-system-options) (label label) (uuid uuid))))) @@ -71,19 +72,22 @@ take the partition metadata size into account, take a 25% margin." 'make-partition-image'." (let ((size (partition-size partition)) (fs (partition-file-system partition)) + (fs-options (partition-file-system-options partition)) (label (partition-label partition)) (uuid (partition-uuid partition)) - (options "lazy_itable_init=1,lazy_journal_init=1")) - (invoke "mke2fs" "-t" fs "-d" root - "-L" label "-U" (uuid->string uuid) - "-E" (format #f "root_owner=~a:~a,~a" - owner-uid owner-gid options) - target - (format #f "~ak" - (size-in-kib - (if (eq? size 'guess) - (estimate-partition-size root) - size)))))) + (journal-options "lazy_itable_init=1,lazy_journal_init=1")) + (apply invoke + `("mke2fs" "-t" ,fs "-d" ,root + "-L" ,label "-U" ,(uuid->string uuid) + "-E" ,(format #f "root_owner=~a:~a,~a" + owner-uid owner-gid journal-options) + ,@fs-options + ,target + ,(format #f "~ak" + (size-in-kib + (if (eq? size 'guess) + (estimate-partition-size root) + size))))))) (define* (make-vfat-image partition target root) "Handle the creation of VFAT partition images. See 'make-partition-image'." |