From b508bb52fd3c7e9862c0475d052deb5474be2e0c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 11 Mar 2015 22:31:45 -0400 Subject: propellor spin --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f15affbf..363109ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +propellor (2.2.1) UNRELEASED; urgency=medium + + * userScriptProperty now passes --shell /bin/sh, so it can be used + even for users with nonstandard shells. + + -- Joey Hess Wed, 11 Mar 2015 22:29:23 -0400 + propellor (2.2.0) unstable; urgency=medium * When running shimmed (eg in a docker container), -- cgit v1.2.3 From 370aad7825f15ed661419875d43320dc1c8f719d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Mar 2015 19:53:40 -0400 Subject: propellor spin --- config-joey.hs | 1 + debian/changelog | 1 + src/Propellor/Shim.hs | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') 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 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") $ -- cgit v1.2.3 From 9292cee1aa7967a0afe6d45f58a6d429d1b56b55 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Mar 2015 20:09:02 -0400 Subject: prep --- debian/changelog | 7 ++++--- propellor.cabal | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7619a1a3..9ac8c3f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ -propellor (2.2.1) UNRELEASED; urgency=medium +propellor (2.2.1) unstable; 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. + * Fix bug in docker propellor shim setup introduced in last release, + which broke provisioning of new docker containers. - -- Joey Hess Wed, 11 Mar 2015 22:29:23 -0400 + -- Joey Hess Thu, 12 Mar 2015 20:08:34 -0400 propellor (2.2.0) unstable; urgency=medium diff --git a/propellor.cabal b/propellor.cabal index ff37003c..c8f093ac 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -1,5 +1,5 @@ Name: propellor -Version: 2.2.0 +Version: 2.2.1 Cabal-Version: >= 1.6 License: BSD3 Maintainer: Joey Hess -- cgit v1.2.3