diff options
| author | Joey Hess <joeyh@joeyh.name> | 2018-05-03 12:25:48 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2018-05-03 12:25:48 -0400 |
| commit | 8f4a01225dbaf4d3f68ad0d94edab3f7650250ad (patch) | |
| tree | f08f8e3e79e813ba132c7195a62868ba17e829a6 /src/Propellor/Property/Chroot.hs | |
| parent | 543aa510790b7b91c0c7dfc13fe41d8c80bc1f77 (diff) | |
| parent | 94653981cab8a9e0640a8ce3eee54a186479c1e5 (diff) | |
Merge branch 'master' into joeyconfig
Diffstat (limited to 'src/Propellor/Property/Chroot.hs')
| -rw-r--r-- | src/Propellor/Property/Chroot.hs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/Propellor/Property/Chroot.hs b/src/Propellor/Property/Chroot.hs index 0dd1f05a..5d29538c 100644 --- a/src/Propellor/Property/Chroot.hs +++ b/src/Propellor/Property/Chroot.hs @@ -169,10 +169,7 @@ propellChroot :: Chroot -> ([String] -> IO (CreateProcess, IO ())) -> Bool -> Pr propellChroot c@(Chroot loc _ _ _) mkproc systemdonly = property (chrootDesc c "provisioned") $ do let d = localdir </> shimdir c let me = localdir </> "propellor" - shim <- liftIO $ ifM (doesDirectoryExist d) - ( pure (Shim.file me d) - , Shim.setup me Nothing d - ) + shim <- liftIO $ Shim.setup me Nothing d ifM (liftIO $ bindmount shim) ( chainprovision shim , return FailedChange |