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

propellor spin

This commit is contained in:
Joey Hess 2015-03-12 19:53:40 -04:00
parent 363ee6ef59
commit 370aad7825
Failed to extract signature
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config-joey.hs
View File

@ -360,6 +360,7 @@ jerryPlay = standardContainer "jerryplay" Unstable "amd64"
kiteShellBox :: Docker.Container kiteShellBox :: Docker.Container
kiteShellBox = standardStableContainer "kiteshellbox" kiteShellBox = standardStableContainer "kiteshellbox"
& JoeySites.kiteShellBox & JoeySites.kiteShellBox
& Docker.publish "4242:4242"
type Motd = [String] type Motd = [String]

1
debian/changelog vendored
View File

@ -2,6 +2,7 @@ propellor (2.2.1) UNRELEASED; urgency=medium
* userScriptProperty now passes --shell /bin/sh, so it can be used * userScriptProperty now passes --shell /bin/sh, so it can be used
even for users with nonstandard shells. 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 -- Joey Hess <id@joeyh.name> Wed, 11 Mar 2015 22:29:23 -0400

2
src/Propellor/Shim.hs
View File

@ -34,7 +34,7 @@ setup propellorbin propellorbinpath dest = checkAlreadyShimmed propellorbin $ do
fromMaybe (error "cannot find ld-linux linker") $ fromMaybe (error "cannot find ld-linux linker") $
headMaybe $ filter ("ld-linux" `isInfixOf`) libs' headMaybe $ filter ("ld-linux" `isInfixOf`) libs'
let linkersym = takeDirectory linker </> takeFileName propellorbin let linkersym = takeDirectory linker </> takeFileName propellorbin
createSymbolicLink linkersym (takeFileName linker) createSymbolicLink (takeFileName linker) linkersym
let gconvdir = (dest ++) $ takeDirectory $ let gconvdir = (dest ++) $ takeDirectory $
fromMaybe (error "cannot find gconv directory") $ fromMaybe (error "cannot find gconv directory") $