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

some comments

This commit is contained in:
Joey Hess 2014-12-05 17:44:09 -04:00
parent 27b61c323f
commit 5ae6a302df
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,12 +77,19 @@ cleanInstallOnce confirmation = check (not <$> doesFileExist flagfile) $
(Just d@(System (Debian _) _)) -> debootstrap d (Just d@(System (Debian _) _)) -> debootstrap d
(Just u@(System (Ubuntu _) _)) -> debootstrap u (Just u@(System (Ubuntu _) _)) -> debootstrap u
_ -> error "os is not declared to be Debian or Ubuntu" _ -> error "os is not declared to be Debian or Ubuntu"
debootstrap targetos = ensureProperty $ toProp $ debootstrap targetos = ensureProperty $ toProp $
-- Ignore the os setting, and install debootstrap from -- Ignore the os setting, and install debootstrap from
-- source, since we don't know what OS we're running in yet. -- source, since we don't know what OS we're running in yet.
Debootstrap.built' Debootstrap.sourceInstall Debootstrap.built' Debootstrap.sourceInstall
newOSDir targetos Debootstrap.DefaultConfig newOSDir targetos Debootstrap.DefaultConfig
-- debootstrap, I wish it was faster..
-- TODO eatmydata to speed it up
-- Problem: Installing eatmydata on some random OS like
-- Fedora may be difficult. Maybe configure dpkg to not
-- sync instead?
-- This is the fun bit.
flipped = property (newOSDir ++ " moved into place") $ liftIO $ do flipped = property (newOSDir ++ " moved into place") $ liftIO $ do
-- First, unmount most mount points, lazily, so -- First, unmount most mount points, lazily, so
-- they don't interfere with moving things around. -- they don't interfere with moving things around.
@ -175,7 +182,7 @@ confirmed desc (Confirmed c) = property desc $ do
-- | /etc/network/interfaces is configured to bring up all interfaces that -- | /etc/network/interfaces is configured to bring up all interfaces that
-- are currently up, using the same IP addresses. -- are currently up, using the same IP addresses.
preserveNetworkInterfaces :: Property preserveNetworkInterfaces :: Property
preserveNetworkInterfaces = undefined preserveNetworkInterfaces = undefined -- TODO
-- | /etc/resolv.conf is copied the from the old OS -- | /etc/resolv.conf is copied the from the old OS
preserveResolvConf :: Property preserveResolvConf :: Property