diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-11-16 18:00:20 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-11-16 18:00:20 -0400 |
| commit | fc208477a6c76fcd39ca35f2e183bbf386b50379 (patch) | |
| tree | 56d4f42f9b47aa6554ac237ab21e5b523cddfbc4 /src/Propellor/Property/DiskImage.hs | |
| parent | 7b9eec0b2883168cc97f63f7329ea9b6e074a573 (diff) | |
propellor spin
Diffstat (limited to 'src/Propellor/Property/DiskImage.hs')
| -rw-r--r-- | src/Propellor/Property/DiskImage.hs | 4 |
1 files changed, 2 insertions, 2 deletions
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 |
