diff options
| author | Joey Hess <id@joeyh.name> | 2014-12-04 16:29:33 -0400 |
|---|---|---|
| committer | Joey Hess <id@joeyh.name> | 2014-12-04 16:29:33 -0400 |
| commit | e47fbd9b39708e3488e047a5c22565ff23e79d46 (patch) | |
| tree | 3553ea37dbba3db774618a7d59a5698fa0482d30 /src | |
| parent | c00219f5934a1aa73e7526a6d073c6c1e7b30a50 (diff) | |
propellor spin
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/OS.hs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/Propellor/Property/OS.hs b/src/Propellor/Property/OS.hs index e09b3d8b..20e6e47f 100644 --- a/src/Propellor/Property/OS.hs +++ b/src/Propellor/Property/OS.hs @@ -55,15 +55,15 @@ cleanInstallOnce confirmation = check (not <$> doesFileExist flagfile) $ go `requires` confirmed "clean install confirmed" confirmation where go = - osbootstrapped - `before` - transitioned - `before` - User.shadowConfig True - `before` - propellorbootstrapped - `before` finalized + `requires` + propellorbootstrapped + `requires` + User.shadowConfig True + `requires` + flipped + `requires` + osbootstrapped osbootstrapped = withOS "/new-os bootstrapped" $ \o -> case o of (Just d@(System (Debian _) _)) -> debootstrap d @@ -72,7 +72,7 @@ cleanInstallOnce confirmation = check (not <$> doesFileExist flagfile) $ debootstrap targetos = ensureProperty $ toProp $ Debootstrap.built "/new-os" targetos Debootstrap.DefaultConfig - transitioned = property "/new-os moved into place" $ + flipped = property "/new-os moved into place" $ return FailedChange -- unmount all mounts -- move all directories to /old-os, |