aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2021-06-08 14:07:59 -0700
committerSean Whitton <spwhitton@spwhitton.name>2021-06-08 14:08:44 -0700
commit548816cf9a97656e72aa2644c1bd5e5e9ac3d475 (patch)
tree51d31a4c99e6a059217f3cc1b435667af19f730f
parent1393bb0305bb80dfd5ebe57268b55e7d0dfa8567 (diff)
downloadconsfigurator-548816cf9a97656e72aa2644c1bd5e5e9ac3d475.tar.gz
CHROOT:OS-BOOTSTRAPPED{,-FOR}: make unapplicable
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
-rw-r--r--src/package.lisp1
-rw-r--r--src/property/chroot.lisp8
2 files changed, 6 insertions, 3 deletions
diff --git a/src/package.lisp b/src/package.lisp
index e9434be..64eba15 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -404,6 +404,7 @@
(#:apt #:consfigurator.property.apt)
(#:os #:consfigurator.property.os)
(#:container #:consfigurator.property.container)
+ (#:mount #:consfigurator.property.mount)
(#:file #:consfigurator.property.file))
(:shadow #:deploys #:deploys. #:deploys-these #:deploys-these.)
(:export #:deploys
diff --git a/src/property/chroot.lisp b/src/property/chroot.lisp
index ee11cbd..e41c888 100644
--- a/src/property/chroot.lisp
+++ b/src/property/chroot.lisp
@@ -99,9 +99,11 @@ OPTIONS is a plist of values to pass to the OS-specific bootstrapping property."
(:desc
(declare (ignore options))
#?"Built chroot for ${(get-hostname child-host*)} @ ${root}")
- (%os-bootstrapper-installed child-host*)
- (%os-bootstrapped options root child-host*)
- (consfigurator:deploys `((:chroot :into ,root)) child-host))
+ (with-unapply
+ (%os-bootstrapper-installed child-host*)
+ (%os-bootstrapped options root child-host*)
+ (consfigurator:deploys `((:chroot :into ,root)) child-host)
+ :unapply (mount:unmounted-below-and-removed root)))
(defproplist os-bootstrapped :lisp (options root properties)
"Bootstrap an OS into ROOT and apply PROPERTIES.