diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2022-01-11 20:31:27 +0100 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-02-07 16:22:37 -0500 |
| commit | 472680a28d83f79935bd526db6ed7ed39cdd9198 (patch) | |
| tree | 73e1f77b188798cc3beaa88a6c22542a4f42ab5e /gnu/build/image.scm | |
| parent | 805af862c6f0f6c54b74125bff8d348ae8f8e6f8 (diff) | |
| download | guix-472680a28d83f79935bd526db6ed7ed39cdd9198.tar.gz | |
build: image: Account for fixed-size file system structures.
Workaround for <https://issues.guix.gnu.org/53194>. * gnu/build/image.scm (estimate-partition-size): Enforce a 1-MiB minimum. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Diffstat (limited to 'gnu/build/image.scm')
| -rw-r--r-- | gnu/build/image.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/build/image.scm b/gnu/build/image.scm index bdd5ec25a9..81caa424f8 100644 --- a/gnu/build/image.scm +++ b/gnu/build/image.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016 Christine Lemmer-Webber <cwebber@dustycloud.org> ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> -;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2020, 2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; ;;; This file is part of GNU Guix. @@ -62,8 +62,10 @@ (define (estimate-partition-size root) "Given the ROOT directory, evaluate and return its size. As this doesn't -take the partition metadata size into account, take a 25% margin." - (* 1.25 (file-size root))) +take the partition metadata size into account, take a 25% margin. As this in +turn doesn't take any constant overhead into account, force a 1-MiB minimum." + (max (ash 1 20) + (* 1.25 (file-size root)))) (define* (make-ext-image partition target root #:key |