summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2015-10-22 20:26:53 -0400
committerJoey Hess2015-10-22 20:26:53 -0400
commit123264e11659d455608c142ccecf320a116ad128 (patch)
treefff7f672bd0eeccbf4dcd9ad78701413928b2d08
parentc84005cbbf432a8296ee44fec83227b15ce18d38 (diff)
propellor spin
-rw-r--r--config-joey.hs1
-rw-r--r--debian/changelog6
2 files changed, 7 insertions, 0 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 24c3843a..cc1a9687 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -85,6 +85,7 @@ darkstar = host "darkstar.kitenet.net"
[
-- partition EXT2 `mountedAt` "/boot" `setFlag` BootFlag
partition EXT4 `mountedAt` "/" `addFreeSpace` MegaBytes 100
+ `setFlag` BootFlag
-- , swapPartition (MegaBytes 256)
] (grubBooted PC)
where
diff --git a/debian/changelog b/debian/changelog
index 49c866bc..60a6f6a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+propellor (2.11.1) UNRELEASED; urgency=medium
+
+ * The DiskImage module can now make bootable images using grub.
+
+ -- Joey Hess <id@joeyh.name> Thu, 22 Oct 2015 20:24:18 -0400
+
propellor (2.11.0) unstable; urgency=medium
* Rewrote Propellor.Property.ControlHeir one more time, renaming it to