diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2021-04-26 12:22:13 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-04-26 12:22:13 -0700 |
| commit | b4477a9b8c66fdea3054fe6969ea06395111e66c (patch) | |
| tree | 1a59201396a8ef264dec634e16eaaa0a2d68e05c /src/property/disk.lisp | |
| parent | 0c17cc2085b7bb5ec1b1d713961dac48ba7ec7de (diff) | |
| download | consfigurator-b4477a9b8c66fdea3054fe6969ea06395111e66c.tar.gz | |
stop binding *MOUNT-BELOW* when closing volumes
We pass the device file to umount(1), so this is not needed.
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src/property/disk.lisp')
| -rw-r--r-- | src/property/disk.lisp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/property/disk.lisp b/src/property/disk.lisp index d7fb0e9..b58fcda 100644 --- a/src/property/disk.lisp +++ b/src/property/disk.lisp @@ -366,8 +366,7 @@ We do not specify what logical volumes it contains.")) (defparameter *mount-below* #P"" "Prefix for all filesystem mount points. Bound by functions to request that filesystems be mounted relative to a different filesystem root, e.g. under a -chroot. The dynamic binding should last until after the filesystems are -unmounted, since the actual mount point is not stored.") +chroot.") (defclass filesystem (volume) ((mount-point :type pathname :initarg :mount-point :accessor mount-point) @@ -494,8 +493,7 @@ single attempt will be made to close all volumes opened up to that point." (push (apply #'open-volume filesystem) opened-volumes))) opened-volumes) (serious-condition (condition) - (unwind-protect - (with-mount-below (mapc #'close-volume opened-volumes)) + (unwind-protect (mapc #'close-volume opened-volumes) (error condition)))))) (defmacro with-open-volumes ((volumes @@ -518,7 +516,7 @@ populate /etc/fstab and /etc/crypttab. Do not modify this list." ,@(and mount-below-supplied-p `(:mount-below ,mount-below))))) (unwind-protect (progn ,@forms) - ,(with-mount-below `(mapc #'close-volume ,opened-volumes))))))) + (mapc #'close-volume ,opened-volumes)))))) (defmacro with-these-open-volumes ((volumes &key (mount-below nil mount-below-supplied-p)) &body propapps) @@ -553,7 +551,7 @@ must not be modified." (apply #'push-hostattrs :opened-volumes opened-volumes) (propappapply propapp)) (mrun "sync") - (with-mount-below (mapc #'close-volume opened-volumes))))) + (mapc #'close-volume opened-volumes)))) :args (cdr propapp))) (defgeneric create-volume-and-contents (volume file) |