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

Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2015-07-21 11:13:24 -04:00
parent a8de302eab 2932c2b420
commit c35f77a724
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -3,6 +3,8 @@ propellor (2.7.0) UNRELEASED; urgency=medium
* Ssh.permitRootLogin type changed to allow configuring WithoutPassword * Ssh.permitRootLogin type changed to allow configuring WithoutPassword
and ForcedCommandsOnly (API change) and ForcedCommandsOnly (API change)
* setSshdConfig type changed, and setSshdConfigBool added with old type. * setSshdConfig type changed, and setSshdConfigBool added with old type.
* Fix a bug in shim generation code for docker and chroots, that
sometimes prevented deployment of docker containers.
-- Joey Hess <id@joeyh.name> Mon, 20 Jul 2015 12:01:38 -0400 -- Joey Hess <id@joeyh.name> Mon, 20 Jul 2015 12:01:38 -0400

5
src/Propellor/Shim.hs
View File

@ -20,7 +20,7 @@ import System.Posix.Files
-- Propellor may be running from an existing shim, in which case it's -- Propellor may be running from an existing shim, in which case it's
-- simply reused. -- simply reused.
setup :: FilePath -> Maybe FilePath -> FilePath -> IO FilePath setup :: FilePath -> Maybe FilePath -> FilePath -> IO FilePath
setup propellorbin propellorbinpath dest = checkAlreadyShimmed propellorbin $ do setup propellorbin propellorbinpath dest = checkAlreadyShimmed shim $ do
createDirectoryIfMissing True dest createDirectoryIfMissing True dest
libs <- parseLdd <$> readProcess "ldd" [propellorbin] libs <- parseLdd <$> readProcess "ldd" [propellorbin]
@ -39,7 +39,6 @@ setup propellorbin propellorbinpath dest = checkAlreadyShimmed propellorbin $ do
fromMaybe (error "cannot find gconv directory") $ fromMaybe (error "cannot find gconv directory") $
headMaybe $ filter ("/gconv/" `isInfixOf`) glibclibs headMaybe $ filter ("/gconv/" `isInfixOf`) glibclibs
let linkerparams = ["--library-path", intercalate ":" libdirs ] let linkerparams = ["--library-path", intercalate ":" libdirs ]
let shim = file propellorbin dest
writeFile shim $ unlines writeFile shim $ unlines
[ shebang [ shebang
, "GCONV_PATH=" ++ shellEscape gconvdir , "GCONV_PATH=" ++ shellEscape gconvdir
@ -49,6 +48,8 @@ setup propellorbin propellorbinpath dest = checkAlreadyShimmed propellorbin $ do
] ]
modifyFileMode shim (addModes executeModes) modifyFileMode shim (addModes executeModes)
return shim return shim
where
shim = file propellorbin dest
shebang :: String shebang :: String
shebang = "#!/bin/sh" shebang = "#!/bin/sh"