summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Property/Grub.hs4
-rw-r--r--src/Propellor/Property/Parted.hs2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Propellor/Property/Grub.hs b/src/Propellor/Property/Grub.hs
index a23f12e4..5cb9077d 100644
--- a/src/Propellor/Property/Grub.hs
+++ b/src/Propellor/Property/Grub.hs
@@ -76,8 +76,8 @@ boots dev = property' ("grub boots " ++ dev) $ \w -> do
targetParam :: GrubTarget -> String
targetParam t = "--target=" ++ case t of
PC -> "i386-pc"
- EFI64 -> "i386-efi"
- EFI32 -> "x86_64-efi"
+ EFI32 -> "i386-efi"
+ EFI64 -> "x86_64-efi"
Coreboot -> "i386-coreboot"
Xen -> "x86_64-xen"
diff --git a/src/Propellor/Property/Parted.hs b/src/Propellor/Property/Parted.hs
index be12933d..97cf815e 100644
--- a/src/Propellor/Property/Parted.hs
+++ b/src/Propellor/Property/Parted.hs
@@ -111,7 +111,7 @@ calcPartedParamsSize (PartTable tabletype alignment parts) =
-- partition size when something about the partition table
-- does not allow the partition to end exactly at the position.
partposfuzzy n
- | n > 0 = show (fromIntegral n / 1000000) ++ "MB"
+ | n > 0 = show (fromIntegral n / 1000000 :: Double) ++ "MB"
| otherwise = "1MB"
-- Location of the start of the first partition,