summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Parted.hs
diff options
context:
space:
mode:
authorJoey Hess2015-12-05 17:53:32 -0400
committerJoey Hess2015-12-05 17:53:32 -0400
commit97a224b194b96184c7938de0bb1e1f423612ccbc (patch)
tree7cc147c4726af8644510c07ba87597920f8301dc /src/Propellor/Property/Parted.hs
parent5c6a43c3b888242443d790efbc1f9282e4e5675c (diff)
parent12548bae3d8feecce6a322162d91b827289ae824 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/Parted.hs')
-rw-r--r--src/Propellor/Property/Parted.hs7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Propellor/Property/Parted.hs b/src/Propellor/Property/Parted.hs
index 834b6c7d..5d6afa9c 100644
--- a/src/Propellor/Property/Parted.hs
+++ b/src/Propellor/Property/Parted.hs
@@ -194,9 +194,10 @@ partitioned eep disk (PartTable tabletype parts) = property desc $ do
-- Parted is run in script mode, so it will never prompt for input.
-- It is asked to use cylinder alignment for the disk.
parted :: Eep -> FilePath -> [String] -> Property NoInfo
-parted YesReallyDeleteDiskContents disk ps =
- cmdProperty "parted" ("--script":"--align":"cylinder":disk:ps)
- `requires` installed
+parted YesReallyDeleteDiskContents disk ps = p `requires` installed
+ where
+ p = cmdProperty "parted" ("--script":"--align":"cylinder":disk:ps)
+ `assume` MadeChange
-- | Gets parted installed.
installed :: Property NoInfo