diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-03-12 19:53:40 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-03-12 19:53:40 -0400 |
| commit | 370aad7825f15ed661419875d43320dc1c8f719d (patch) | |
| tree | c15835616b0c32346d350a0f0c477660567e4f2c | |
| parent | 363ee6ef59efac0f43ff27b4cb9e46126eb44270 (diff) | |
propellor spin
| -rw-r--r-- | config-joey.hs | 1 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | src/Propellor/Shim.hs | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/config-joey.hs b/config-joey.hs index c852826e..723686d6 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -360,6 +360,7 @@ jerryPlay = standardContainer "jerryplay" Unstable "amd64" kiteShellBox :: Docker.Container kiteShellBox = standardStableContainer "kiteshellbox" & JoeySites.kiteShellBox + & Docker.publish "4242:4242" type Motd = [String] diff --git a/debian/changelog b/debian/changelog index 363109ba..7619a1a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ propellor (2.2.1) UNRELEASED; urgency=medium * userScriptProperty now passes --shell /bin/sh, so it can be used even for users with nonstandard shells. + * Fix bug in docker propellor shim setup introduced in last release. -- Joey Hess <id@joeyh.name> Wed, 11 Mar 2015 22:29:23 -0400 diff --git a/src/Propellor/Shim.hs b/src/Propellor/Shim.hs index e1ea2825..5fc1ea05 100644 --- a/src/Propellor/Shim.hs +++ b/src/Propellor/Shim.hs @@ -34,7 +34,7 @@ setup propellorbin propellorbinpath dest = checkAlreadyShimmed propellorbin $ do fromMaybe (error "cannot find ld-linux linker") $ headMaybe $ filter ("ld-linux" `isInfixOf`) libs' let linkersym = takeDirectory linker </> takeFileName propellorbin - createSymbolicLink linkersym (takeFileName linker) + createSymbolicLink (takeFileName linker) linkersym let gconvdir = (dest ++) $ takeDirectory $ fromMaybe (error "cannot find gconv directory") $ |