civodul pushed a commit to branch master
in repository guix.
commit 13e7caf52c467d2fb0f2d59a908e2aebcd430367
Author: Ludovic Courtès <[email protected]>
AuthorDate: Mon Dec 30 10:30:00 2024 +0100
services: resize-file-system: Remove invalid default value.
The default value of #f for the ‘file-system’ field is invalid and would
trigger a type error when running ‘guix system search’.
* gnu/services/admin.scm (<resize-file-system-configuration>)[file-system]:
Remove default value.
(resize-file-system-service-type)[default-value]: Remove.
* doc/guix.texi (Miscellaneous Services): Adjust accordingly.
Change-Id: If73f8923f49d38827059ba98bd53636a7f3917fe
---
doc/guix.texi | 2 +-
gnu/services/admin.scm | 8 +++-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 7bf14a49e9..dbcb39010a 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -42314,7 +42314,7 @@ systems.
@table @asis
-@item @code{file-system} (default: @code{#f}) (type: file-system)
+@item @code{file-system} (type: file-system)
The file-system object to resize (@pxref{File Systems}). This object
must have the @code{device} and @code{type} fields set. Other fields
are ignored.
diff --git a/gnu/services/admin.scm b/gnu/services/admin.scm
index 4a2f5cb12d..571af6a04e 100644
--- a/gnu/services/admin.scm
+++ b/gnu/services/admin.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Jan Nieuwenhuizen <[email protected]>
-;;; Copyright © 2016-2023 Ludovic Courtès <[email protected]>
+;;; Copyright © 2016-2024 Ludovic Courtès <[email protected]>
;;; Copyright © 2020 Brice Waegeneire <[email protected]>
;;; Copyright © 2023 Giacomo Leidi <[email protected]>
;;; Copyright © 2024 Gabriel Wicki <[email protected]>
@@ -572,8 +572,7 @@ which lets you search for packages that provide a given
file.")
(define-record-type* <resize-file-system-configuration>
resize-file-system-configuration make-resize-file-system-configuration
resize-file-system-configuration?
- (file-system resize-file-system-file-system
- (default #f))
+ (file-system resize-file-system-file-system)
(cloud-utils resize-file-system-cloud-utils
(default cloud-utils))
(e2fsprogs resize-file-system-e2fsprogs
@@ -678,7 +677,6 @@ are booted from a system image flashed onto a larger
medium.")
(extensions
(list
(service-extension shepherd-root-service-type
- (compose list resize-file-system-shepherd-service))))
- (default-value (resize-file-system-configuration))))
+ (compose list resize-file-system-shepherd-service))))))
;;; admin.scm ends here
