Merge branch 'joeyconfig'

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"

debian/changelog

@@ -1,8 +1,14 @@
-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
+    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 <joeyh@debian.org>  Sat, 10 May 2014 11:05:19 -0300
+ -- Joey Hess <joeyh@debian.org>  Sat, 17 May 2014 16:42:55 -0400
 
 propellor (0.5.1) unstable; urgency=medium
 

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 <joey@kitenet.net>