aboutsummaryrefslogtreecommitdiff
path: root/src/host.lisp
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2021-06-23 13:54:10 -0700
committerSean Whitton <spwhitton@spwhitton.name>2021-06-23 14:05:38 -0700
commit468d480b6a97380c730bc5a711236d808191abe1 (patch)
tree561e301309acd2a560ffb05aae09eec435aca0c5 /src/host.lisp
parent17eb0140ee7e6bcef366a5601b8dd2db26dbb525 (diff)
downloadconsfigurator-468d480b6a97380c730bc5a711236d808191abe1.tar.gz
REPLACE-PROPSPEC-INTO-HOST: drop :DATA hostattrs
This means that when using DEPLOY-THESE and similar, there won't be errors about missing prerequisite data that is needed only for properties we're not actually applying. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src/host.lisp')
-rw-r--r--src/host.lisp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/host.lisp b/src/host.lisp
index 25decf9..a5efd40 100644
--- a/src/host.lisp
+++ b/src/host.lisp
@@ -132,8 +132,13 @@ Called by properties which set up such subhosts, like CHROOT:OS-BOOTSTRAPPED."
;; value to have all the hostattrs it would have were PROPSPEC not to be
;; substituted in
(make-instance 'unpreprocessed-host
- :hostattrs (hostattrs
- (preprocess-host (shallow-copy-host host)))
+ ;; Drop items of prerequisite data the host usually requires,
+ ;; as we don't need them if we're not applying its usual
+ ;; properties.
+ :hostattrs (remove-from-plist
+ (hostattrs
+ (preprocess-host (shallow-copy-host host)))
+ :data)
:propspec propspec))
(defmacro defhost (hostname (&key deploy) &body properties)