summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
l---------config.hs2
-rw-r--r--privdata/relocate1
-rw-r--r--src/Propellor/Property/Parted/Types.hs2
3 files changed, 4 insertions, 1 deletions
diff --git a/config.hs b/config.hs
index ec313725..97d90636 120000
--- a/config.hs
+++ b/config.hs
@@ -1 +1 @@
-config-simple.hs \ No newline at end of file
+joeyconfig.hs \ No newline at end of file
diff --git a/privdata/relocate b/privdata/relocate
new file mode 100644
index 00000000..271692d8
--- /dev/null
+++ b/privdata/relocate
@@ -0,0 +1 @@
+.joeyconfig
diff --git a/src/Propellor/Property/Parted/Types.hs b/src/Propellor/Property/Parted/Types.hs
index 6b6b42e2..e5c62739 100644
--- a/src/Propellor/Property/Parted/Types.hs
+++ b/src/Propellor/Property/Parted/Types.hs
@@ -88,6 +88,8 @@ instance Monoid PartSize where
reducePartSize :: PartSize -> PartSize -> PartSize
reducePartSize (MegaBytes a) (MegaBytes b) = MegaBytes (a - b)
+reducePartSize (Bytes a) b = Bytes (a - fromPartSize b)
+reducePartSize a (Bytes b) = Bytes (fromPartSize a - b)
-- | Partitions need to be aligned for optimal efficiency.
-- The alignment is a number of bytes.