diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2021-04-26 16:08:26 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-04-26 16:09:20 -0700 |
| commit | ef987f23559e424ab37199c182d2450aa2d40f76 (patch) | |
| tree | 623277d81307537948a0a8f316c1e1cffeb3e5e1 | |
| parent | eb259a86f079f5b91d0926c5c0779636cef49450 (diff) | |
| download | consfigurator-ef987f23559e424ab37199c182d2450aa2d40f76.tar.gz | |
define UNION-PROPSPEC-INTO-HOST for null second argument
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| -rw-r--r-- | src/deployment.lisp | 4 | ||||
| -rw-r--r-- | src/host.lisp | 4 | ||||
| -rw-r--r-- | src/property/chroot.lisp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/deployment.lisp b/src/deployment.lisp index cd5c5a7..5a70e15 100644 --- a/src/deployment.lisp +++ b/src/deployment.lisp @@ -64,9 +64,7 @@ DEPLOY, DEPLOY-THESE, and the function definitions established by DEFDEPLOY, DEFDEPLOY-THESE, etc., rather than calling this function directly. However, code which programmatically constructs deployments will need to call this." (%consfigure (preprocess-connections connections) - (if additional-properties - (union-propspec-into-host host additional-properties) - host))) + (union-propspec-into-host host additional-properties))) (defun deploy-these* (connections host properties) "Like DEPLOY*, but replace the properties of HOST with PROPERTIES. diff --git a/src/host.lisp b/src/host.lisp index 5c8b6e9..35336da 100644 --- a/src/host.lisp +++ b/src/host.lisp @@ -111,6 +111,10 @@ Called by properties which set up such subhosts, like CHROOT:OS-BOOTSTRAPPED." :hostattrs (copy-list (hostattrs host)) :propspec (append-propspecs (host-propspec host) propspec))) +(defmethod union-propspec-into-host + ((host unpreprocessed-host) (propspec null)) + host) + (defmethod replace-propspec-into-host ((host unpreprocessed-host) (propspec unpreprocessed-propspec)) ;; we have to preprocess HOST as functions that call us want the return diff --git a/src/property/chroot.lisp b/src/property/chroot.lisp index 4ae4307..994e548 100644 --- a/src/property/chroot.lisp +++ b/src/property/chroot.lisp @@ -61,9 +61,7 @@ (defproplist os-bootstrapped-for :lisp (options root host &optional additional-properties &aux - (host (if additional-properties - (union-propspec-into-host host additional-properties) - host)) + (host (union-propspec-into-host host additional-properties)) (child-host (make-child-host :hostattrs (hostattrs host) |