From 2081a49b659ddb1a9c8b647f2703a052ea38953b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 14 May 2014 20:36:23 -0400 Subject: [PATCH 1/3] changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7a06e2f..5859e40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,12 @@ propellor (0.5.2) UNRELEASED; urgency=medium + * A bug that caused propellor to hang when updating a running docker + container appears to have been fixed. Note that since it affects + the propellor process that serves as "init" of docker containers, + they have to be restarted for the fix to take effect. * Licence changed from GPL to BSD. + * A few changes to allow building Propellor on OSX. One user reports + successfully using it there. -- Joey Hess Sat, 10 May 2014 11:05:19 -0300 From 08ecafb418f9902d0f902ab0cf88bcc07b6df8b2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 15 May 2014 01:04:03 -0400 Subject: [PATCH 2/3] add --- config-joey.hs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/config-joey.hs b/config-joey.hs index 769357c..9278808 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -252,6 +252,22 @@ image (System (Debian Unstable) arch) = "joeyh/debian-unstable-" ++ arch image (System (Debian Stable) arch) = "joeyh/debian-stable-" ++ arch image _ = "debian-stable-official" -- does not currently exist! +-- Digital Ocean does not provide any way to boot +-- the kernel provided by the distribution, except using kexec. +-- Without this, some old, and perhaps insecure kernel will be used. +-- +-- Note that this only causes the new kernel to be loaded on reboot. +-- If the power is cycled, the old kernel still boots up. +-- TODO: detect this and reboot immediately? +digitalOceanDistroKernel :: Property +digitalOceanDistroKernel = propertyList "digital ocean distro kernel hack" + [ Apt.installed ["grub-pc", "kexec-tools"] + , "/etc/default/kexec" `File.containsLines` + [ "LOAD_KEXEC=true" + , "USE_GRUB_CONFIG=true" + ] + ] + -- Clean up a system as installed by cloudatcost.com cleanCloudAtCost :: Property cleanCloudAtCost = propertyList "cloudatcost cleanup" From c09babd5b7cb059cc9fa5ffb2ddfa4255e21e321 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 17 May 2014 16:43:10 -0400 Subject: [PATCH 3/3] prep release --- debian/changelog | 4 ++-- propellor.cabal | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5859e40..16ababc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -propellor (0.5.2) UNRELEASED; urgency=medium +propellor (0.5.2) unstable; urgency=medium * A bug that caused propellor to hang when updating a running docker container appears to have been fixed. Note that since it affects @@ -8,7 +8,7 @@ propellor (0.5.2) UNRELEASED; urgency=medium * A few changes to allow building Propellor on OSX. One user reports successfully using it there. - -- Joey Hess Sat, 10 May 2014 11:05:19 -0300 + -- Joey Hess Sat, 17 May 2014 16:42:55 -0400 propellor (0.5.1) unstable; urgency=medium diff --git a/propellor.cabal b/propellor.cabal index 55b7eb6..9d0612e 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -1,5 +1,5 @@ Name: propellor -Version: 0.5.1 +Version: 0.5.2 Cabal-Version: >= 1.6 License: BSD Maintainer: Joey Hess