diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-09-05 16:30:58 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-09-05 16:30:58 -0400 |
| commit | d9866a1ba5d0a4adca8bd026c652b762302bba45 (patch) | |
| tree | 3142654661458b11993863a91852c7e8803c040c /src/Propellor/Property/Lvm.hs | |
| parent | 196a112539407c55c73628c0c29f7ff54c709275 (diff) | |
move parseFs to Property.Partition
Diffstat (limited to 'src/Propellor/Property/Lvm.hs')
| -rw-r--r-- | src/Propellor/Property/Lvm.hs | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/Propellor/Property/Lvm.hs b/src/Propellor/Property/Lvm.hs index e1f3b934..c5d215bc 100644 --- a/src/Propellor/Property/Lvm.hs +++ b/src/Propellor/Property/Lvm.hs @@ -142,27 +142,15 @@ lvState lv = do then return Nothing else do s <- readLvSize - fs <- readFs + fs <- maybe Nothing (Partition.parseFs . takeWhile (/= '\n')) <$> readFs return $ do size <- s - return $ LvState size $ parseFs $ - takeWhile (/= '\n') <$> fs + return $ LvState size fs where readLvSize = catchDefaultIO Nothing $ readish <$> readProcess "lvs" [ "-o", "size", "--noheadings", "--nosuffix", "--units", "b", vglv lv ] readFs = Mount.blkidTag "TYPE" (path lv) - parseFs (Just "ext2") = Just Partition.EXT2 - parseFs (Just "ext3") = Just Partition.EXT3 - parseFs (Just "ext4") = Just Partition.EXT4 - parseFs (Just "btrfs") = Just Partition.BTRFS - parseFs (Just "reiserfs") = Just Partition.REISERFS - parseFs (Just "xfs") = Just Partition.XFS - parseFs (Just "fat") = Just Partition.FAT - parseFs (Just "vfat") = Just Partition.VFAT - parseFs (Just "ntfs") = Just Partition.NTFS - parseFs (Just "swap") = Just Partition.LinuxSwap - parseFs _ = Nothing -- Read extent size (or Nothing on error). vgExtentSize :: VolumeGroup -> IO (Maybe Integer) |