summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-12-04 16:24:35 -0400
committerJoey Hess2014-12-04 16:24:35 -0400
commit5eb980d04851e26ed5cff47d98374de9688b349d (patch)
tree68e6e95acbc4a6f06b9398a7b2738ec3a02e31f6
parent1106c305d05f910795b4b549ef0348ce6ba15b85 (diff)
propellor spin
-rw-r--r--src/Propellor/Property/OS.hs23
1 files changed, 12 insertions, 11 deletions
diff --git a/src/Propellor/Property/OS.hs b/src/Propellor/Property/OS.hs
index 0138be9c..f06e1b78 100644
--- a/src/Propellor/Property/OS.hs
+++ b/src/Propellor/Property/OS.hs
@@ -52,18 +52,19 @@ import qualified Propellor.Property.User as User
-- > -- rest of system properties here
cleanInstallOnce :: Confirmation -> Property
cleanInstallOnce confirmation = check (not <$> doesFileExist flagfile) $
- osbootstrapped
- `requires`
- confirmed "clean install confirmed" confirmation
- `before`
- transitioned
- `before`
- User.shadowConfig True
- `before`
- propellorbootstrapped
- `before`
- finalized
+ go `requires` confirmed "clean install confirmed" confirmation
where
+ go =
+ osbootstrapped
+ `before`
+ transitioned
+ `before`
+ User.shadowConfig True
+ `before`
+ propellorbootstrapped
+ `before`
+ finalized
+
osbootstrapped = withOS "/new-os bootstrapped" $ \o -> case o of
(Just d@(System (Debian _) _)) -> debootstrap d
(Just u@(System (Ubuntu _) _)) -> debootstrap u