From 2a9d0bb514aa4744590db91fee0a8439f9c937a5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 20 Dec 2017 13:11:35 -0400 Subject: setting up joeyconfig after merge --- config.hs | 2 +- privdata/relocate | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 privdata/relocate 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 -- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3 From 59220d30d5bc89a461b13d45ea386851ff3a87e8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 20 Dec 2017 17:18:07 -0400 Subject: propellor spin --- src/Propellor/Property/Parted/Types.hs | 2 ++ 1 file changed, 2 insertions(+) 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. -- cgit v1.2.3