summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2015-11-24 16:35:46 -0400
committerJoey Hess2015-11-24 16:35:46 -0400
commit6f949b35602f7b2095b7248981dce7381a09852d (patch)
tree6e7ae989788443aa8fdfb3f4f0a18af87ae3d87b
parenta6d48cc36eb635a913a44d0a645bcf2147e973e4 (diff)
haddock improvements
-rw-r--r--src/Propellor.hs1
-rw-r--r--src/Propellor/Property/DiskImage.hs24
-rw-r--r--src/Propellor/Types.hs1
3 files changed, 15 insertions, 11 deletions
diff --git a/src/Propellor.hs b/src/Propellor.hs
index 9d45c376..53b209ca 100644
--- a/src/Propellor.hs
+++ b/src/Propellor.hs
@@ -31,7 +31,6 @@ module Propellor (
Host(..)
, Property
, RevertableProperty
- , (<!>)
, module Propellor.Types
-- * Config file
, defaultMain
diff --git a/src/Propellor/Property/DiskImage.hs b/src/Propellor/Property/DiskImage.hs
index 4878c365..2e0ec661 100644
--- a/src/Propellor/Property/DiskImage.hs
+++ b/src/Propellor/Property/DiskImage.hs
@@ -52,17 +52,21 @@ type DiskImage = FilePath
-- > import Propellor.Property.DiskImage
--
-- > let chroot d = Chroot.debootstrapped (System (Debian Unstable) "amd64") mempty d
--- > & Apt.installed ["linux-image-amd64"]
--- > & ...
+-- > & Apt.installed ["linux-image-amd64"]
+-- > & User.hasPassword (User "root")
+-- > & User.accountFor (User "demo")
+-- > & User.hasPassword (User "demo")
+-- > & User.hasDesktopGroups (User "demo")
+-- > & ...
-- > in imageBuilt "/srv/images/foo.img" chroot
--- > MSDOS (grubBooted PC)
--- > [ partition EXT2 `mountedAt` "/boot"
--- > `setFlag` BootFlag
--- > , partition EXT4 `mountedAt` "/"
--- > `addFreeSpace` MegaBytes 100
--- > `mountOpt` errorReadonly
--- > , swapPartition (MegaBytes 256)
--- > ]
+-- > MSDOS (grubBooted PC)
+-- > [ partition EXT2 `mountedAt` "/boot"
+-- > `setFlag` BootFlag
+-- > , partition EXT4 `mountedAt` "/"
+-- > `addFreeSpace` MegaBytes 100
+-- > `mountOpt` errorReadonly
+-- > , swapPartition (MegaBytes 256)
+-- > ]
--
-- Note that the disk image file is reused if it already exists,
-- to avoid expensive IO to generate a new one. And, it's updated in-place,
diff --git a/src/Propellor/Types.hs b/src/Propellor/Types.hs
index 3d2fbf14..58e86247 100644
--- a/src/Propellor/Types.hs
+++ b/src/Propellor/Types.hs
@@ -27,6 +27,7 @@ module Propellor.Types
, IsProp(..)
, Combines(..)
, CombinedType
+ , ResultCombiner
, Propellor(..)
, LiftPropellor(..)
, EndAction(..)