From fc208477a6c76fcd39ca35f2e183bbf386b50379 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 16 Nov 2017 18:00:20 -0400 Subject: propellor spin --- src/Propellor/Property/DiskImage.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Propellor') diff --git a/src/Propellor/Property/DiskImage.hs b/src/Propellor/Property/DiskImage.hs index fe2e60ac..acfe58f5 100644 --- a/src/Propellor/Property/DiskImage.hs +++ b/src/Propellor/Property/DiskImage.hs @@ -192,11 +192,11 @@ imageBuilt' rebuild img mkchroot tabletype partspec = -- installed. final = case fromInfo (containerInfo chroot) of [] -> unbootable "no bootloader is installed" - l -> case filter ignorablefinal l of + l -> case filter (not . ignorablefinal) l of [] -> \_ _ _ -> doNothing [GrubInstalled] -> grubFinalized [UbootInstalled p] -> ubootFinalized p - _ -> unbootable "multiple bootloaders are installed; don't know which to use" + l -> unbootable $ "multiple bootloaders are installed; don't know which to use: " ++ show l ignorablefinal FlashKernelInstalled = True ignorablefinal _ = False -- cgit v1.2.3