summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
l---------config.hs2
-rw-r--r--debian/changelog4
-rw-r--r--doc/news/version_5.0.0.mdwn20
-rw-r--r--privdata/relocate1
-rw-r--r--src/Propellor/Property/DiskImage.hs2
-rw-r--r--src/Propellor/Property/Machine.hs4
6 files changed, 26 insertions, 7 deletions
diff --git a/config.hs b/config.hs
index 97d90636..ec313725 120000
--- a/config.hs
+++ b/config.hs
@@ -1 +1 @@
-joeyconfig.hs \ No newline at end of file
+config-simple.hs \ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 2b41af51..f88089d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-propellor (5.0.0) UNRELEASED; urgency=medium
+propellor (5.0.0) unstable; urgency=medium
* Debootstrap.built now supports bootstrapping chroots for foreign
OS's, using qemu-user-static.
@@ -19,7 +19,7 @@ propellor (5.0.0) UNRELEASED; urgency=medium
* Fail2Ban: Renamed jail.d conf file to use .local.
Thanks, Félix Sipma.
- -- Joey Hess <id@joeyh.name> Thu, 02 Nov 2017 10:28:44 -0400
+ -- Joey Hess <id@joeyh.name> Sun, 19 Nov 2017 15:42:44 -0400
propellor (4.9.0) unstable; urgency=medium
diff --git a/doc/news/version_5.0.0.mdwn b/doc/news/version_5.0.0.mdwn
new file mode 100644
index 00000000..dbf678cc
--- /dev/null
+++ b/doc/news/version_5.0.0.mdwn
@@ -0,0 +1,20 @@
+propellor 5.0.0 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+ * Debootstrap.built now supports bootstrapping chroots for foreign
+ OS's, using qemu-user-static.
+ * Machine: New module collecting machine-specific properties for
+ building bootable images for ARM boards.
+ Tested working boards: Olimex Lime, CubieTruck, Banana Pi, SheevaPlug.
+ * Diskimage.imageBuiltFor: New property to build a disk image for a Host,
+ using partition table information configured via the new properties
+ hasPartitionTableType, hasPartition and adjustPartition.
+ * Chroot.noServices moved to Service.noServices and its type changed.
+ (API change)
+ * Service: Avoid starting services when noServices is used.
+ * Add Typeable instance to OriginUrl, fixing build with old versions
+ of ghc.
+ * Added Propellor.Property.impossible
+ * Fail2Ban: Added several additional properties.
+ Thanks, Félix Sipma.
+ * Fail2Ban: Renamed jail.d conf file to use .local.
+ Thanks, Félix Sipma."""]] \ No newline at end of file
diff --git a/privdata/relocate b/privdata/relocate
deleted file mode 100644
index 271692d8..00000000
--- a/privdata/relocate
+++ /dev/null
@@ -1 +0,0 @@
-.joeyconfig
diff --git a/src/Propellor/Property/DiskImage.hs b/src/Propellor/Property/DiskImage.hs
index 3c6eda09..6564192f 100644
--- a/src/Propellor/Property/DiskImage.hs
+++ b/src/Propellor/Property/DiskImage.hs
@@ -148,7 +148,7 @@ imageRebuilt = imageBuilt' True
-- | Create a bootable disk image for a Host.
--
-- This works just like 'imageBuilt', but partition table is
--- determined by looking at the Host's 'hasPartitionTableType'
+-- determined by looking at the Host's 'hasPartitionTableType',
-- `hasPartition', and 'adjustPartition' properties.
--
-- For example:
diff --git a/src/Propellor/Property/Machine.hs b/src/Propellor/Property/Machine.hs
index ec522c21..bf820872 100644
--- a/src/Propellor/Property/Machine.hs
+++ b/src/Propellor/Property/Machine.hs
@@ -16,8 +16,8 @@
-- be functional at all without it, its property will include the non-free
-- firmware, but if the non-free firmware is only needed for non-critical
-- functionality, it won't be included.
-
--- | Example: Building a disk image for a Marvell SheevaPlug
+--
+-- Example: Building a disk image for a Marvell SheevaPlug
--
-- This defines a Host "sheeva" that is a Marvell SheevaPlug.
-- A bootable disk image for "sheeva" is built on another machine