aboutsummaryrefslogtreecommitdiff
path: root/src/property
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2022-04-28 15:52:53 -0700
committerSean Whitton <spwhitton@spwhitton.name>2022-04-28 16:24:34 -0700
commit4d0c10c402aaef7a3c43683e40e33ce59ddcf1f5 (patch)
treeb25095eec418aba735cf508588562f871cc6ca8f /src/property
parent1e69e649bf457f928da0bc88849b96e4622b4bb9 (diff)
downloadconsfigurator-4d0c10c402aaef7a3c43683e40e33ce59ddcf1f5.tar.gz
rename connattr :OPENED-VOLUMES -> DISK:OPENED-VOLUMES
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src/property')
-rw-r--r--src/property/crypttab.lisp2
-rw-r--r--src/property/disk.lisp10
-rw-r--r--src/property/fstab.lisp2
-rw-r--r--src/property/installer.lisp4
4 files changed, 9 insertions, 9 deletions
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) "/")