---
rde/features/predicates.scm | 3 ++-
rde/features/system.scm | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/rde/features/predicates.scm b/rde/features/predicates.scm
index 0245e05..7d97660 100644
--- a/rde/features/predicates.scm
+++ b/rde/features/predicates.scm
@@ -68,4 +68,5 @@
(and (list? lst) (every file-system? lst)))
(define-public (list-of-mapped-devices? lst)
(and (list? lst) (every mapped-device? lst)))
-
+(define-public (list-of-swap-devices? lst)
+ (and (list? lst) (every swap-space? lst)))
diff --git a/rde/features/system.scm b/rde/features/system.scm
index 600eab6..79e53e6 100644
--- a/rde/features/system.scm
+++ b/rde/features/system.scm
@@ -53,19 +53,21 @@ keyboard-layout will be overriden by feature-keyboard if it present."
(define* (feature-file-systems
#:key
(mapped-devices '())
+ (swap-devices '())
(file-systems '())
(base-file-systems %base-file-systems))
"Provides file systems for operating-system. By default
%base-file-systems will be added to the end of FILE-SYSTEMS, this
behavior can be overriden with BASE-FILE-SYSTEM argument."
(ensure-pred list-of-mapped-devices? mapped-devices)
+ (ensure-pred list-of-swap-devices? swap-devices)
(ensure-pred list-of-file-systems? file-systems)
(ensure-pred list-of-file-systems? base-file-systems)
(let ((file-systems (append file-systems base-file-systems)))
(feature
(name 'file-systems)
- (values (make-feature-values mapped-devices file-systems)))))
+ (values (make-feature-values mapped-devices swap-devices file-systems)))))
(define* (feature-kernel
--
2.36.1
On 2022-07-03 16:56, Nicolas Graves wrote:
> ---
> rde/features/predicates.scm | 3 ++-
> rde/features/system.scm | 4 +++-
> 2 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/rde/features/predicates.scm b/rde/features/predicates.scm
> index 0245e05..7d97660 100644
> --- a/rde/features/predicates.scm
> +++ b/rde/features/predicates.scm
> @@ -68,4 +68,5 @@
> (and (list? lst) (every file-system? lst)))
> (define-public (list-of-mapped-devices? lst)
> (and (list? lst) (every mapped-device? lst)))
> -
> +(define-public (list-of-swap-devices? lst)
> + (and (list? lst) (every swap-space? lst)))
> diff --git a/rde/features/system.scm b/rde/features/system.scm
> index 600eab6..79e53e6 100644
> --- a/rde/features/system.scm
> +++ b/rde/features/system.scm
> @@ -53,19 +53,21 @@ keyboard-layout will be overriden by feature-keyboard if it present."
> (define* (feature-file-systems
> #:key
> (mapped-devices '())
> + (swap-devices '())
> (file-systems '())
> (base-file-systems %base-file-systems))
> "Provides file systems for operating-system. By default
> %base-file-systems will be added to the end of FILE-SYSTEMS, this
> behavior can be overriden with BASE-FILE-SYSTEM argument."
> (ensure-pred list-of-mapped-devices? mapped-devices)
> + (ensure-pred list-of-swap-devices? swap-devices)
> (ensure-pred list-of-file-systems? file-systems)
> (ensure-pred list-of-file-systems? base-file-systems)
>
> (let ((file-systems (append file-systems base-file-systems)))
> (feature
> (name 'file-systems)
> - (values (make-feature-values mapped-devices file-systems)))))
> + (values (make-feature-values mapped-devices swap-devices file-systems)))))
>
>
> (define* (feature-kernel
Hi Nicolas,
Thank you for the patch, reworded commit message, added swap-devices to
operating-system in rde/features.scm
--
Best regards,
Andrew Tropin