cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propellor spin

This commit is contained in:
Joey Hess 2014-12-04 16:24:35 -04:00
parent 1106c305d0
commit 5eb980d048
Failed to extract signature
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Propellor/Property/OS.hs
View File

@ -52,9 +52,10 @@ import qualified Propellor.Property.User as User
-- > -- rest of system properties here -- > -- rest of system properties here
cleanInstallOnce :: Confirmation -> Property cleanInstallOnce :: Confirmation -> Property
cleanInstallOnce confirmation = check (not <$> doesFileExist flagfile) $ cleanInstallOnce confirmation = check (not <$> doesFileExist flagfile) $
go `requires` confirmed "clean install confirmed" confirmation
where
go =
osbootstrapped osbootstrapped
`requires`
confirmed "clean install confirmed" confirmation
`before` `before`
transitioned transitioned
`before` `before`
@ -63,7 +64,7 @@ cleanInstallOnce confirmation = check (not <$> doesFileExist flagfile) $
propellorbootstrapped propellorbootstrapped
`before` `before`
finalized finalized
where
osbootstrapped = withOS "/new-os bootstrapped" $ \o -> case o of osbootstrapped = withOS "/new-os bootstrapped" $ \o -> case o of
(Just d@(System (Debian _) _)) -> debootstrap d (Just d@(System (Debian _) _)) -> debootstrap d
(Just u@(System (Ubuntu _) _)) -> debootstrap u (Just u@(System (Ubuntu _) _)) -> debootstrap u