From 0dab106a6af36eaebfd533d3e38c1275deb85935 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 1 Jul 2022 12:06:39 +0200 Subject: image: Add sanitizers for 'format' and 'partition-table-type'. This allows common mistakes to be diagnosed early. * gnu/image.scm (define-set-sanitizer): New macro. (validate-image-format, validate-partition-table-type): New sanitizers. ()[format, partition-table-type]: Add 'sanitize' property. --- gnu/image.scm | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to 'gnu/image.scm') diff --git a/gnu/image.scm b/gnu/image.scm index e347089b34..486c02aadc 100644 --- a/gnu/image.scm +++ b/gnu/image.scm @@ -19,6 +19,10 @@ (define-module (gnu image) #:use-module (guix platform) #:use-module (guix records) + #:use-module (guix diagnostics) + #:use-module (guix i18n) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35) #:export (partition partition? partition-device @@ -77,12 +81,31 @@ ;;; Image record. ;;; +(define-syntax-rule (define-set-sanitizer name field set) + "Define NAME as a procedure or macro that raises an error if passed a value +that is not in SET, mentioning FIELD in the error message." + (define-with-syntax-properties (name (value properties)) + (unless (memq value 'set) + (raise + (make-compound-condition + (condition + (&error-location + (location (source-properties->location properties)))) + (formatted-message (G_ "~s: invalid '~a' value") value 'field)))) + value)) + +(define-set-sanitizer validate-image-format format + (disk-image compressed-qcow2 docker iso9660)) +(define-set-sanitizer validate-partition-table-type partition-table-type + (mbr gpt)) + (define-record-type* image make-image image? (name image-name ;symbol (default #f)) - (format image-format) ;symbol + (format image-format ;symbol + (sanitize validate-image-format)) (platform image-platform ; (default #f)) (size image-size ;size in bytes as integer @@ -90,7 +113,8 @@ (operating-system image-operating-system ; (default #f)) (partition-table-type image-partition-table-type ; 'mbr or 'gpt - (default 'mbr)) + (default 'mbr) + (sanitize validate-partition-table-type)) (partitions image-partitions ;list of (default '())) (compression? image-compression? ;boolean -- cgit v1.2.3