diff options
| -rw-r--r-- | doc/connections.rst | 3 | ||||
| -rw-r--r-- | src/connection/chroot.lisp | 2 | ||||
| -rw-r--r-- | src/package.lisp | 10 | ||||
| -rw-r--r-- | src/property/crypttab.lisp | 2 | ||||
| -rw-r--r-- | src/property/disk.lisp | 10 | ||||
| -rw-r--r-- | src/property/fstab.lisp | 2 | ||||
| -rw-r--r-- | src/property/installer.lisp | 4 |
7 files changed, 18 insertions, 15 deletions
diff --git a/doc/connections.rst b/doc/connections.rst index 63e2204..b958139 100644 --- a/doc/connections.rst +++ b/doc/connections.rst @@ -81,8 +81,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-OPENED-VOLUMES`` property combinator. +[list incomplete] Notes on particular connection types ------------------------------------ diff --git a/src/connection/chroot.lisp b/src/connection/chroot.lisp index 45e7a6e..854043e 100644 --- a/src/connection/chroot.lisp +++ b/src/connection/chroot.lisp @@ -68,7 +68,7 @@ should be the mount point, without the chroot's root prefixed.") (apply #'chroot-mount connection mount:+linux-efivars-vfs+))))) (defmethod propagate-connattr - ((type (eql :opened-volumes)) connattr (connection chroot-connection)) + ((type (eql 'disk:opened-volumes)) connattr (connection chroot-connection)) (with-slots (into) connection (loop for volume in connattr when (and (subtypep (type-of volume) 'disk:filesystem) diff --git a/src/package.lisp b/src/package.lisp index 395bd9d..242b204 100644 --- a/src/package.lisp +++ b/src/package.lisp @@ -623,6 +623,7 @@ #:crypttab-keyfile #:linux-swap + #:opened-volumes #:with-opened-volumes #:has-volumes @@ -637,7 +638,8 @@ (package :consfigurator.property.fstab (:use #:consfigurator.property.disk) (:local-nicknames (#:os #:consfigurator.property.os) - (#:file #:consfigurator.property.file)) + (#:file #:consfigurator.property.file) + (#:disk #:consfigurator.property.disk)) (:export #:volume-to-entry #:has-entries #:has-entries-for-volumes @@ -647,7 +649,8 @@ (:use #:consfigurator.property.disk) (:local-nicknames (#:re #:cl-ppcre) (#:os #:consfigurator.property.os) - (#:file #:consfigurator.property.file)) + (#:file #:consfigurator.property.file) + (#:disk #:consfigurator.property.disk)) (:export #:volume-to-entry #:has-entries-for-opened-volumes)) @@ -711,7 +714,8 @@ (#:mount #:consfigurator.property.mount) (#:fstab #:consfigurator.property.fstab) (#:reboot #:consfigurator.property.reboot) - (#:crypttab #:consfigurator.property.crypttab)) + (#:crypttab #:consfigurator.property.crypttab) + (#:disk #:consfigurator.property.disk)) (:export #:install-bootloader-propspec #:install-bootloader-binaries-propspec #:chroot-installed-to-volumes-for diff --git a/src/property/crypttab.lisp b/src/property/crypttab.lisp index 4229cbf..cd71079 100644 --- a/src/property/crypttab.lisp +++ b/src/property/crypttab.lisp @@ -84,4 +84,4 @@ This is used when building disk images and installing operating systems." (apply #'has-entries (mapcar #'volume-to-entry (mapcan (curry #'subvolumes-of-type 'opened-luks-container) - (get-connattr :opened-volumes)))))) + (get-connattr 'disk:opened-volumes)))))) diff --git a/src/property/disk.lisp b/src/property/disk.lisp index bbca317..3093280 100644 --- a/src/property/disk.lisp +++ b/src/property/disk.lisp @@ -739,9 +739,9 @@ open each of VOLUMES and any contents thereof, apply PROPAPPS, and close all volumes that were opened. 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." +FILESYSTEM volumes. During the application of PROPAPPS, all +'DISK:OPENED-VOLUMES connattrs are replaced with a list of the volumes that +were opened; this list must not be modified." `(with-opened-volumes* ',volumes ,(if (cdr propapps) `(eseqprops ,@propapps) (car propapps)) @@ -756,13 +756,13 @@ must not be modified." (propapp-attrs propapp)) :apply (lambda-ignoring-args - (with-connattrs (:opened-volumes + (with-connattrs ('opened-volumes (apply #'open-volumes-and-contents `(,volumes ,@(and mount-below-supplied-p `(:mount-below ,mount-below))))) (unwind-protect (apply-propapp propapp) (mrun "sync") - (mapc #'close-volume (get-connattr :opened-volumes))))) + (mapc #'close-volume (get-connattr 'opened-volumes))))) :args (cdr propapp))) (defun create-volumes-and-contents (volumes &optional files) diff --git a/src/property/fstab.lisp b/src/property/fstab.lisp index 7c0a758..7b269e2 100644 --- a/src/property/fstab.lisp +++ b/src/property/fstab.lisp @@ -119,4 +119,4 @@ This is used when building disk images and installing operating systems." (multiple-value-list (multiple-value-mapcan (curry #'subvolumes-of-type 'mounted-filesystem) - (get-connattr :opened-volumes))))))) + (get-connattr 'disk:opened-volumes))))))) diff --git a/src/property/installer.lisp b/src/property/installer.lisp index 1031cde..d3e4311 100644 --- a/src/property/installer.lisp +++ b/src/property/installer.lisp @@ -70,7 +70,7 @@ BOOTLOADER-TYPE to VOLUME.")) :hostattrs (lambda () (mapc #'propapp-attrs propapps)) :apply (lambda () - (mapc #'consfigure (get-propspecs (get-connattr :opened-volumes))) + (mapc #'consfigure (get-propspecs (get-connattr 'disk:opened-volumes))) (mrun "sync")))) @@ -83,7 +83,7 @@ BOOTLOADER-TYPE to VOLUME.")) (run "rsync" "-PSavx" "--delete" (loop for volume in (mapcan (curry #'subvolumes-of-type 'mounted-filesystem) - (get-connattr :opened-volumes)) + (get-connattr 'disk:opened-volumes)) collect (strcat "--exclude=" (unix-namestring (mount-point volume)))) (strcat (unix-namestring chroot) "/") |