summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/OS.hs
diff options
context:
space:
mode:
authorJoey Hess2014-12-05 16:47:18 -0400
committerJoey Hess2014-12-05 16:48:52 -0400
commit00ab24016453c1d787b7132654f96f614d177d27 (patch)
tree0a7f2d4b5453c3bca00d10544e7cdd078aa8c894 /src/Propellor/Property/OS.hs
parent35648961ddbd65cd2f7901366610bfc318667a84 (diff)
fix install of debootstrap from source
Diffstat (limited to 'src/Propellor/Property/OS.hs')
-rw-r--r--src/Propellor/Property/OS.hs5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Propellor/Property/OS.hs b/src/Propellor/Property/OS.hs
index 3f999e23..020d7435 100644
--- a/src/Propellor/Property/OS.hs
+++ b/src/Propellor/Property/OS.hs
@@ -78,7 +78,10 @@ cleanInstallOnce confirmation = check (not <$> doesFileExist flagfile) $
(Just u@(System (Ubuntu _) _)) -> debootstrap u
_ -> error "os is not declared to be Debian or Ubuntu"
debootstrap targetos = ensureProperty $ toProp $
- Debootstrap.built newOSDir targetos Debootstrap.DefaultConfig
+ -- Ignore the os setting, and install debootstrap from
+ -- source, since we don't know what OS we're running in yet.
+ Debootstrap.built' Debootstrap.sourceInstall
+ newOSDir targetos Debootstrap.DefaultConfig
flipped = property (newOSDir ++ " moved into place") $ liftIO $ do
-- First, unmount most mount points, lazily, so