From c487ae071d19d099c05e6a66029ba4641f43f23b Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 23 Apr 2022 14:01:48 -0700 Subject: rename to INSTALLER:CHROOT-INSTALLED-TO-VOLUMES-FOR Signed-off-by: Sean Whitton --- src/property/disk.lisp | 2 +- src/property/installer.lisp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/property') diff --git a/src/property/disk.lisp b/src/property/disk.lisp index e9c35e6..ca2d2f7 100644 --- a/src/property/disk.lisp +++ b/src/property/disk.lisp @@ -941,7 +941,7 @@ filesystems will be incrementally updated when other properties change." (caches-cleaned))) (%raw-image-created ,volumes :chroot ,chroot :rebuild ,rebuild)) - (consfigurator.property.installer:chroot-installed-to-volumes + (consfigurator.property.installer:chroot-installed-to-volumes-for ,host ,chroot ,volumes)))) (defprop %squashfsed :posix (chroot image &optional (compression "xz")) diff --git a/src/property/installer.lisp b/src/property/installer.lisp index 26bcd8b..ff74a4d 100644 --- a/src/property/installer.lisp +++ b/src/property/installer.lisp @@ -48,11 +48,11 @@ BOOTLOADER-TYPE to VOLUME.")) ;; At :HOSTATTRS time we don't have the OPENED-VOLUME values required by the ;; :APPLY subroutines which actually install the bootloaders. So we call -;; GET-PROPSPECS twice: (in CHROOT-INSTALLED-TO-VOLUMES) at :HOSTATTRS time to -;; generate propspecs for the sake of running :HOSTATTRS subroutines, and then -;; at :APPLY time where we can get at the OPENED-VOLUME values, we ignore the -;; previously generated propspecs and call GET-PROPSPECS again. This approach -;; should work for any sensible VOLUME<->OPENED-VOLUME pairs. +;; GET-PROPSPECS twice: (in CHROOT-INSTALLED-TO-VOLUMES-FOR) at :HOSTATTRS +;; time to generate propspecs for the sake of running :HOSTATTRS subroutines, +;; and then at :APPLY time where we can get at the OPENED-VOLUME values, we +;; ignore the previously generated propspecs and call GET-PROPSPECS again. +;; This approach should work for any sensible VOLUME<->OPENED-VOLUME pairs. (define-function-property-combinator %install-bootloaders (running-on-target &rest propapps) (:retprop @@ -80,7 +80,7 @@ BOOTLOADER-TYPE to VOLUME.")) (strcat (unix-namestring chroot) "/") (strcat (unix-namestring target) "/")))) -(defpropspec chroot-installed-to-volumes :lisp +(defpropspec chroot-installed-to-volumes-for :lisp (host chroot volumes &key running-on-target) "Where CHROOT contains the root filesystem of HOST and VOLUMES is a list of volumes, recursively open the volumes and rsync in the contents of CHROOT. -- cgit v1.2.3