diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-09-02 15:36:24 -0700 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-09-02 15:36:24 -0700 |
| commit | 6dfc583d27cb0aeecf48f6dae01b98625902372b (patch) | |
| tree | 5063aa19a9d72f1afbdc83cf6453b65e17037e75 | |
| parent | fe59ea1a62ff8dd15e30646802b9ca045df3008b (diff) | |
propellor spin
| -rw-r--r-- | src/Propellor/Property/DiskImage.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Propellor/Property/DiskImage.hs b/src/Propellor/Property/DiskImage.hs index 1d087cc0..384718ca 100644 --- a/src/Propellor/Property/DiskImage.hs +++ b/src/Propellor/Property/DiskImage.hs @@ -73,9 +73,8 @@ imageBuilt' rebuild img mkchroot mkparttable final = (mkimg <!> unmkimg) -- TODO snd final -- TODO copy in - -- TODO fst final -- TODO chroot topevel directory perm fixup - `requires` Chroot.provisioned (mkchroot chrootdir) + `requires` Chroot.provisioned (mkchroot chrootdir & fst final) `requires` (cleanrebuild <!> doNothing) `describe` desc where @@ -121,9 +120,10 @@ imageExists img sz = property ("disk image exists" ++ img) $ liftIO $ do return MadeChange -- | Generates a map of the sizes of the contents of --- every directory in a filesystem tree. +-- every directory in a filesystem tree. (Hard links are counted multiple +-- times for simplicity) -- --- Should be same values as du -b +-- Should be same values as du -bl dirSizes :: FilePath -> IO (M.Map FilePath Integer) dirSizes top = go M.empty top [top] where |