From 5eb980d04851e26ed5cff47d98374de9688b349d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 4 Dec 2014 16:24:35 -0400 Subject: propellor spin --- src/Propellor/Property/OS.hs | 23 ++++++++++++----------- 1 file 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 -- cgit v1.2.3