summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2015-02-16 19:01:32 -0400
committerJoey Hess2015-02-16 19:01:32 -0400
commitbe1a3a7c89ca8ea8aecb9a9748380ef840598171 (patch)
tree05225c6799d2f90d515ca6acca8404599eca1dee
parent90643c1d986438d039b14be90bc994b6ae9cf001 (diff)
When running shimmed (eg in a docker container), improve process name visible in ps.
-rw-r--r--debian/changelog7
-rw-r--r--src/Propellor/Shim.hs5
2 files changed, 11 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index dfe3b3c5..ef4b8a28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+propellor (2.1.1) UNRELEASED; urgency=medium
+
+ * When running shimmed (eg in a docker container),
+ improve process name visible in ps.
+
+ -- Joey Hess <id@joeyh.name> Mon, 16 Feb 2015 19:00:48 -0400
+
propellor (2.1.0) unstable; urgency=medium
* Additional tor properties, including support for making relays,
diff --git a/src/Propellor/Shim.hs b/src/Propellor/Shim.hs
index da4c96eb..e1ea2825 100644
--- a/src/Propellor/Shim.hs
+++ b/src/Propellor/Shim.hs
@@ -33,6 +33,9 @@ setup propellorbin propellorbinpath dest = checkAlreadyShimmed propellorbin $ do
let linker = (dest ++) $
fromMaybe (error "cannot find ld-linux linker") $
headMaybe $ filter ("ld-linux" `isInfixOf`) libs'
+ let linkersym = takeDirectory linker </> takeFileName propellorbin
+ createSymbolicLink linkersym (takeFileName linker)
+
let gconvdir = (dest ++) $ takeDirectory $
fromMaybe (error "cannot find gconv directory") $
headMaybe $ filter ("/gconv/" `isInfixOf`) glibclibs
@@ -42,7 +45,7 @@ setup propellorbin propellorbinpath dest = checkAlreadyShimmed propellorbin $ do
[ shebang
, "GCONV_PATH=" ++ shellEscape gconvdir
, "export GCONV_PATH"
- , "exec " ++ unwords (map shellEscape $ linker : linkerparams) ++
+ , "exec " ++ unwords (map shellEscape $ linkersym : linkerparams) ++
" " ++ shellEscape (fromMaybe propellorbin propellorbinpath) ++ " \"$@\""
]
modifyFileMode shim (addModes executeModes)