diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2021-07-08 10:50:56 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-07-10 20:53:46 -0700 |
| commit | 5217bc067885bd77ea93d5db1fb36d7cf94949c7 (patch) | |
| tree | 16bd07f695d7eb001410749986f63f5811152ee0 /src/property/disk.lisp | |
| parent | 76d96ad3ba78dc392ebb1aff66bbef210f9a876e (diff) | |
| download | consfigurator-5217bc067885bd77ea93d5db1fb36d7cf94949c7.tar.gz | |
DISK::WITH-OPEN-VOLUMES: drop unneeded use of ONCE-ONLY
Was causing a warning in the case where MOUNT-BELOW was not supplied.
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, 8 insertions, 9 deletions
diff --git a/src/property/disk.lisp b/src/property/disk.lisp index b66bae7..c2d39f9 100644 --- a/src/property/disk.lisp +++ b/src/property/disk.lisp @@ -721,15 +721,14 @@ MOUNT-BELOW specifies a pathname to prefix to mount points when opening FILESYSTEM volumes. OPENED-VOLUMES specifies a symbol to which a list of all volumes that were opened will be bound, which can be used to do things like populate /etc/fstab and /etc/crypttab. Do not modify this list." - (once-only (mount-below) - (let ((opened-volumes (or opened-volumes (gensym)))) - `(let ((,opened-volumes (open-volumes-and-contents - ,volumes - ,@(and mount-below-supplied-p - `(:mount-below ,mount-below))))) - (unwind-protect (progn ,@forms) - (mrun "sync") - (mapc #'close-volume ,opened-volumes)))))) + (let ((opened-volumes (or opened-volumes (gensym)))) + `(let ((,opened-volumes (open-volumes-and-contents + ,volumes + ,@(and mount-below-supplied-p + `(:mount-below ,mount-below))))) + (unwind-protect (progn ,@forms) + (mrun "sync") + (mapc #'close-volume ,opened-volumes))))) (defmacro with-these-open-volumes ((volumes &key (mount-below nil mount-below-supplied-p)) &body propapps) |