aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2021-07-01 13:39:39 -0700
committerSean Whitton <spwhitton@spwhitton.name>2021-07-06 21:19:19 -0700
commit38b43ba1ab315efdb5750622dfb7bad45cfe1259 (patch)
treeba672cd3e852cf5333fe6e03a07722fb46de47a2
parent646585a7a79f3ff6b8f5fc413b87f0903f3c2151 (diff)
downloadconsfigurator-38b43ba1ab315efdb5750622dfb7bad45cfe1259.tar.gz
REPLACE-PROPSPEC-INTO-HOST: union the lists of ASDF systems
Also see 646585a7a79f3ff6b8f5fc413b87f0903f3c2151. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
-rw-r--r--src/host.lisp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/host.lisp b/src/host.lisp
index 477ac09..1b6ff8f 100644
--- a/src/host.lisp
+++ b/src/host.lisp
@@ -140,7 +140,13 @@ Called by properties which set up such subhosts, like CHROOT:OS-BOOTSTRAPPED."
(hostattrs
(preprocess-host (shallow-copy-host host)))
:data)
- :propspec propspec))
+ :propspec (make-propspec
+ ;; Add the original PROPSPEC-SYSTEMS so that we
+ ;; know that all the hostattrs are instantiable.
+ :systems
+ (union (propspec-systems propspec)
+ (propspec-systems (host-propspec host)))
+ :propspec (propspec-props propspec))))
(defmacro defhost (hostname (&key deploy) &body properties)
"Define a host with hostname HOSTNAME and properties PROPERTIES.