From 1b4fa7851b39f087a6433e8b5e22c479ca1da289 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 20 May 2020 16:09:53 +0200 Subject: image: Add partition offset support. * gnu/image.scm (partition-offset): New procedure, ()[offset]: new field. * gnu/system/image.scm (system-disk-image): Apply the partition offset. --- gnu/image.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/image.scm') diff --git a/gnu/image.scm b/gnu/image.scm index b05fc69dc5..3a02692950 100644 --- a/gnu/image.scm +++ b/gnu/image.scm @@ -22,6 +22,7 @@ partition? partition-device partition-size + partition-offset partition-file-system partition-label partition-uuid @@ -47,6 +48,7 @@ partition? (device partition-device (default #f)) (size partition-size) + (offset partition-offset (default #f)) (file-system partition-file-system (default "ext4")) (label partition-label (default #f)) (uuid partition-uuid (default #f)) -- cgit v1.2.3 From 1dd7b87f101ce99b37be5c769904c1aa2f6a0615 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 26 May 2020 13:05:22 +0200 Subject: image: Set offset default to zero. * gnu/image.scm ()[offset]: Set to zero by default. * gnu/system/image.scm (system-disk-image): Adapt accordingly. --- gnu/image.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/image.scm') diff --git a/gnu/image.scm b/gnu/image.scm index 3a02692950..b434ed50e3 100644 --- a/gnu/image.scm +++ b/gnu/image.scm @@ -48,7 +48,7 @@ partition? (device partition-device (default #f)) (size partition-size) - (offset partition-offset (default #f)) + (offset partition-offset (default 0)) (file-system partition-file-system (default "ext4")) (label partition-label (default #f)) (uuid partition-uuid (default #f)) -- cgit v1.2.3 From bd3716f6fee127562935d86ff7f641197366769c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 26 May 2020 16:25:25 +0200 Subject: image: Add partition file-system options support. * gnu/image.scm ()[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. --- gnu/image.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'gnu/image.scm') diff --git a/gnu/image.scm b/gnu/image.scm index b434ed50e3..0a92d168e9 100644 --- a/gnu/image.scm +++ b/gnu/image.scm @@ -24,6 +24,7 @@ partition-size partition-offset partition-file-system + partition-file-system-options partition-label partition-uuid partition-flags @@ -46,14 +47,16 @@ (define-record-type* partition make-partition partition? - (device partition-device (default #f)) - (size partition-size) - (offset partition-offset (default 0)) - (file-system partition-file-system (default "ext4")) - (label partition-label (default #f)) - (uuid partition-uuid (default #f)) - (flags partition-flags (default '())) - (initializer partition-initializer (default #f))) + (device partition-device (default #f)) + (size partition-size) + (offset partition-offset (default 0)) + (file-system partition-file-system (default "ext4")) + (file-system-options partition-file-system-options + (default '())) + (label partition-label (default #f)) + (uuid partition-uuid (default #f)) + (flags partition-flags (default '())) + (initializer partition-initializer (default #f))) ;;; -- cgit v1.2.3