From 1e69e649bf457f928da0bc88849b96e4622b4bb9 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Thu, 28 Apr 2022 15:48:25 -0700
Subject: rename DISK:WITH-THESE-OPEN-VOLUMES -> DISK:WITH-OPENED-VOLUMES

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
---
 doc/connections.rst         | 2 +-
 src/package.lisp            | 2 +-
 src/property/disk.lisp      | 8 ++++----
 src/property/fstab.lisp     | 2 +-
 src/property/installer.lisp | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/connections.rst b/doc/connections.rst
index d03d3a8..63e2204 100644
--- a/doc/connections.rst
+++ b/doc/connections.rst
@@ -82,7 +82,7 @@ Reserved names for connection attributes
 The semantics of connattrs identified by keywords are documented here.
 
 - ``:OPENED-VOLUMES``: instances of ``DISK:OPENED-VOLUME``.  Bound by
-  ``DISK:WITH-THESE-OPEN-VOLUMES`` property combinator.
+  ``DISK:WITH-OPENED-VOLUMES`` property combinator.
 
 Notes on particular connection types
 ------------------------------------
diff --git a/src/package.lisp b/src/package.lisp
index 805d462..395bd9d 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -623,7 +623,7 @@
                     #:crypttab-keyfile
                     #:linux-swap
 
-                    #:with-these-open-volumes
+                    #:with-opened-volumes
 
                     #:has-volumes
                     #:raw-image-built-for
diff --git a/src/property/disk.lisp b/src/property/disk.lisp
index 6cc8328..bbca317 100644
--- a/src/property/disk.lisp
+++ b/src/property/disk.lisp
@@ -667,7 +667,7 @@ order in which they should be closed.  MOUNT-BELOW specifies a pathname to
 prefix to mount points when opening FILESYSTEM volumes.
 
 Calling this function can be useful for testing at the REPL, but code should
-normally use WITH-OPEN-VOLUMES or WITH-THESE-OPEN-VOLUMES.
+normally use WITH-OPEN-VOLUMES or WITH-OPENED-VOLUMES.
 
 If an error is signalled while the attempt to open volumes is in progress, a
 single attempt will be made to close all volumes opened up to that point."
@@ -731,7 +731,7 @@ populate /etc/fstab and /etc/crypttab.  Do not modify this list."
          (mrun "sync")
          (mapc #'close-volume ,opened-volumes)))))
 
-(defmacro with-these-open-volumes
+(defmacro with-opened-volumes
     ((volumes &key (mount-below nil mount-below-supplied-p)) &body propapps)
   "Macro property combinator.  Where each of VOLUMES is a VOLUME which may be
 opened by calling OPEN-VOLUME with NIL as the second argument, recursively
@@ -742,12 +742,12 @@ MOUNT-BELOW specifies a pathname to prefix to mount points when opening
 FILESYSTEM volumes.  During the application of PROPAPPS, all :OPENED-VOLUMES
 connattrs are replaced with a list of the volumes that were opened; this list
 must not be modified."
-  `(with-these-open-volumes*
+  `(with-opened-volumes*
      ',volumes
      ,(if (cdr propapps) `(eseqprops ,@propapps) (car propapps))
      ,@(and mount-below-supplied-p `(:mount-below ,mount-below))))
 
-(define-function-property-combinator with-these-open-volumes*
+(define-function-property-combinator with-opened-volumes*
     (volumes propapp &key (mount-below nil mount-below-supplied-p))
   (:retprop
    :type (propapp-type propapp)
diff --git a/src/property/fstab.lisp b/src/property/fstab.lisp
index 43c0caa..7c0a758 100644
--- a/src/property/fstab.lisp
+++ b/src/property/fstab.lisp
@@ -102,7 +102,7 @@ specified with DISK:HAS-VOLUMES."
                           (or volumes (get-hostattrs :volumes))))))))
 
 ;; TODO This is broken for fat32 partitions.  MOUNTED-FAT32-FILESYSTEM objects
-;; are pushed directly to the connattr by DISK:WITH-THESE-OPEN-VOLUMES, rather
+;; are pushed directly to the connattr by DISK:WITH-OPENED-VOLUMES, rather
 ;; than appearing within OPENED-PARTITION objects.  Then the call to
 ;; SUBVOLUMES-OF-TYPE here never finds any parents, returning as a second
 ;; value a list containing only NIL.  Thus the specialisers in the
diff --git a/src/property/installer.lisp b/src/property/installer.lisp
index 5949e16..1031cde 100644
--- a/src/property/installer.lisp
+++ b/src/property/installer.lisp
@@ -100,7 +100,7 @@ Also update the fstab and crypttab, and try to install bootloader(s)."
             (drop-trailing-slash
              (unix-namestring (ensure-directory-pathname chroot)))
             ".target"))))
-    `(with-these-open-volumes (,volumes :mount-below ,target)
+    `(with-opened-volumes (,volumes :mount-below ,target)
        (%update-target-from-chroot ,chroot ,target)
        (chroot:deploys-these
         ,target ,host
-- 
cgit v1.2.3