diff options
Diffstat (limited to 'src/Propellor')
| -rw-r--r-- | src/Propellor/Property/Debootstrap.hs | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/Propellor/Property/Debootstrap.hs b/src/Propellor/Property/Debootstrap.hs index fe87cc27..2ba9faac 100644 --- a/src/Propellor/Property/Debootstrap.hs +++ b/src/Propellor/Property/Debootstrap.hs @@ -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"] |