diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-12-20 17:50:03 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-12-20 17:50:03 -0400 |
| commit | 704259a2b4d11443c74e1dd4dd2ef1ba8d36ffd0 (patch) | |
| tree | bd02078f8dfec19e99b971c8ad03e56eb891c439 | |
| parent | ddc4f39e228b0b995c3dccb470a116867638e679 (diff) | |
| parent | 59220d30d5bc89a461b13d45ea386851ff3a87e8 (diff) | |
Merge branch 'joeyconfig'
| l--------- | config.hs | 2 | ||||
| -rw-r--r-- | privdata/relocate | 1 | ||||
| -rw-r--r-- | src/Propellor/Property/Parted/Types.hs | 2 |
3 files changed, 4 insertions, 1 deletions
@@ -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. |