propellor spin

This commit is contained in:
Joey Hess 2014-11-22 21:30:50 -04:00
parent 3f98cdbced
commit 1d5d911aa0
Failed to extract signature
1 changed files with 11 additions and 1 deletions

View File

@ -78,7 +78,8 @@ built target system@(System _ arch) config =
, Param target
]
cmd <- fromMaybe "debootstrap" <$> programPath
ifM (boolSystem cmd params)
de <- debootstrapEnv
ifM (boolSystemEnv cmd params (Just de))
( do
fixForeignDev target
return MadeChange
@ -107,6 +108,15 @@ built target system@(System _ arch) config =
, return False
)
-- workaround for http://bugs.debian.org/770658
debootstrapEnv :: IO [(String, String)]
debootstrapEnv = do
path <- getEnvDefault "/bin" "PATH"
addEntry "PATH" (path ++ debianPath)
<$> getEnvironment
where
debianPath = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
mountPoints :: IO [FilePath]
mountPoints = lines <$> readProcess "findmnt" ["-rn", "--output", "target"]