aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2021-04-24 18:40:48 -0700
committerSean Whitton <spwhitton@spwhitton.name>2021-04-24 18:41:14 -0700
commitef3af3890beef5a3d036f912b96823bfc4620c8d (patch)
tree5976f2deda194434b099e6d468f2a13b73ef4063 /src
parent75aeee263207f2578d82f7e717b0fa7251f0f50b (diff)
downloadconsfigurator-ef3af3890beef5a3d036f912b96823bfc4620c8d.tar.gz
CHROOT:OS-BOOTSTRAPPED-FOR: accept additional properties
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src')
-rw-r--r--src/package.lisp1
-rw-r--r--src/property/chroot.lisp5
2 files changed, 5 insertions, 1 deletions
diff --git a/src/package.lisp b/src/package.lisp
index 30c99e8..bc3834d 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -332,6 +332,7 @@
(#:os #:consfigurator.property.os)
(#:file #:consfigurator.property.file))
(:export #:os-bootstrapped-for
+ #:os-bootstrapped-for.
#:os-bootstrapped
#:os-bootstrapped.))
diff --git a/src/property/chroot.lisp b/src/property/chroot.lisp
index 341b791..4ae4307 100644
--- a/src/property/chroot.lisp
+++ b/src/property/chroot.lisp
@@ -59,8 +59,11 @@
(debian (%debootstrapped ,root ,host ,@options)))))
(defproplist os-bootstrapped-for :lisp
- (options root host
+ (options root host &optional additional-properties
&aux
+ (host (if additional-properties
+ (union-propspec-into-host host additional-properties)
+ host))
(child-host
(make-child-host
:hostattrs (hostattrs host)