diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2021-04-29 13:22:54 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-04-30 17:53:58 -0700 |
commit | e866051ecfade8ee49ecdbebedc94a9caed3e047 (patch) | |
tree | f6628e33d1f7030d25743e8a9629e2ee978a9b61 /src/property/disk.lisp | |
parent | 4ad6d1b85a94e879ef5da95746cc6896b2906f6c (diff) | |
download | consfigurator-e866051ecfade8ee49ecdbebedc94a9caed3e047.tar.gz |
add :OPENED-VOLUMES connattr
hostattrs don't make sense for this, as it should be possible to gather all
hostattrs without examining the host.
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src/property/disk.lisp')
-rw-r--r-- | src/property/disk.lisp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/property/disk.lisp b/src/property/disk.lisp index 1dffc81..e659c94 100644 --- a/src/property/disk.lisp +++ b/src/property/disk.lisp @@ -529,7 +529,7 @@ 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 -hostattrs are replaced with a list of the volumes that were opened; this list +connattrs are replaced with a list of the volumes that were opened; this list must not be modified." `(with-these-open-volumes* ,volumes @@ -544,16 +544,13 @@ must not be modified." :apply (lambda (&rest ignore) (declare (ignore ignore)) - (let ((opened-volumes - (apply #'open-volumes-and-contents - `(,volumes ,@(and mount-below-supplied-p - `(:mount-below ,mount-below)))))) - (unwind-protect-in-parent - (with-replace-hostattrs (:opened-volumes) - (apply #'push-hostattrs :opened-volumes opened-volumes) - (propappapply propapp)) + (with-connattrs (:opened-volumes + (apply #'open-volumes-and-contents + `(,volumes ,@(and mount-below-supplied-p + `(:mount-below ,mount-below))))) + (unwind-protect-in-parent (propappapply propapp) (mrun "sync") - (mapc #'close-volume opened-volumes)))) + (mapc #'close-volume (get-connattr :opened-volumes))))) :args (cdr propapp))) (defgeneric create-volume-and-contents (volume file) |