summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rw-r--r--src/Propellor/Property/Partition.hs2
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index a00e5a17..6c9bd36f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ propellor (4.0.1) UNRELEASED; urgency=medium
* Fix build with pre-AMP ghc.
* Tor.named, Tor.torPrivKey: Include the new ed25519 public/private key
pair in addition to the old secret_id_key.
+ * Property.Partition: Improve loop device detection code used with kpartx
+ when building disk images. /dev/mapper/loop* symlinks are now detected
+ as block devices.
-- Joey Hess <id@joeyh.name> Sat, 18 Mar 2017 19:40:35 -0400
diff --git a/src/Propellor/Property/Partition.hs b/src/Propellor/Property/Partition.hs
index 2bf5b927..756e2b6b 100644
--- a/src/Propellor/Property/Partition.hs
+++ b/src/Propellor/Property/Partition.hs
@@ -58,7 +58,7 @@ isLoopDev l = isLoopDev' (partitionLoopDev l) <&&> isLoopDev' (wholeDiskLoopDev
isLoopDev' :: FilePath -> IO Bool
isLoopDev' f
| "loop" `isInfixOf` f = catchBoolIO $
- isBlockDevice <$> getFileStatus f
+ isBlockDevice <$> getSymbolicLinkStatus f
| otherwise = return False
-- | Uses the kpartx utility to create device maps for partitions contained