|author||Joey Hess||2017-07-04 12:38:21 -0400|
|committer||Joey Hess||2017-07-04 12:38:21 -0400|
Bootstrap.bootstrappedFrom: Avoid doing anything when not run in a chroot.
This way, when a disk image is built using this property, and booted up, running propellor won't try to ensure this property again. This commit was sponsored by Jeff Goeke-Smith on Patreon.
Diffstat (limited to 'src/Propellor/Property/Bootstrap.hs')
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Propellor/Property/Bootstrap.hs b/src/Propellor/Property/Bootstrap.hs
index 099559ad..767d6ef7 100644
@@ -17,17 +17,17 @@ data RepoSource
-- | Bootstraps a propellor installation into
--- Normally, propellor is already bootstrapped when it runs, so this
--- property is not useful. However, this can be useful inside a
--- chroot used to build a disk image, to make the disk image
--- have propellor installed.
+-- This property only does anything when used inside a chroot.
+-- This is particularly useful inside a chroot used to build a
+-- disk image, to make the disk image have propellor installed.
-- The git repository is cloned (or pulled to update if it already exists).
-- All build dependencies are installed, using distribution packages
-- or falling back to using cabal.
bootstrappedFrom :: RepoSource -> Property Linux
-bootstrappedFrom reposource = go `requires` clonedFrom reposource
+bootstrappedFrom reposource = check inChroot $
+ go `requires` clonedFrom reposource
go :: Property Linux
go = property "Propellor bootstrapped" $ do