diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2022-04-23 14:01:48 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2022-04-23 14:34:07 -0700 |
commit | c487ae071d19d099c05e6a66029ba4641f43f23b (patch) | |
tree | 479034bd59a96de4248fc550d64fba93d8ffdcf9 | |
parent | 16072787a88b8fdddda4c0e238f2c9570186321e (diff) | |
download | consfigurator-c487ae071d19d099c05e6a66029ba4641f43f23b.tar.gz |
rename to INSTALLER:CHROOT-INSTALLED-TO-VOLUMES-FOR
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
-rw-r--r-- | doc/tutorial/os_installation.rst | 4 | ||||
-rw-r--r-- | src/package.lisp | 2 | ||||
-rw-r--r-- | src/property/disk.lisp | 2 | ||||
-rw-r--r-- | src/property/installer.lisp | 12 |
4 files changed, 10 insertions, 10 deletions
diff --git a/doc/tutorial/os_installation.rst b/doc/tutorial/os_installation.rst index a6f1ea0..f15da41 100644 --- a/doc/tutorial/os_installation.rst +++ b/doc/tutorial/os_installation.rst @@ -71,8 +71,8 @@ could then use:: (live-installer-built-for test.example.com)) Then once the live system has booted on the target host, you'd use the -DISK:HOST-VOLUMES-CREATED and INSTALLER:CHROOT-INSTALLED-TO-VOLUMES properties -to complete the installation. +DISK:HOST-VOLUMES-CREATED and INSTALLER:CHROOT-INSTALLED-TO-VOLUMES-FOR +properties to complete the installation. To prepare a live image that is capable of installing more than one system without an Internet connection, you'd probably need to investigate including diff --git a/src/package.lisp b/src/package.lisp index a3c58e5..a0b4206 100644 --- a/src/package.lisp +++ b/src/package.lisp @@ -712,7 +712,7 @@ (#:crypttab #:consfigurator.property.crypttab)) (:export #:install-bootloader-propspec #:install-bootloader-binaries-propspec - #:chroot-installed-to-volumes + #:chroot-installed-to-volumes-for #:bootloader-binaries-installed #:bootloaders-installed #:cleanly-installed-once)) 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. |