always run setupLoopDevices before mount -t btrfs

1 files changed, 6 insertions, 0 deletions

diff --git a/fsmgr.hs b/fsmgr.hs
index e4317c6..2a2309e 100644
--- a/fsmgr.hs
+++ b/fsmgr.hs
@@ -181,6 +181,7 @@ buildInitialImage DiskImageConfig{..} mountpoint out = do
       cmd_ "truncate -s" [show n, out]
       cmd_ "fallocate -l" [show n, out]
 
+      setupLoopDevices parent
       idempotentMountImage parent mountpoint
 
       addImageToBtrfs out mountpoint
@@ -189,6 +190,8 @@ buildInitialImage DiskImageConfig{..} mountpoint out = do
       cmd_ "truncate -s" [show n] [out]
       cmd_ "mkfs.btrfs" [out]
       cmd_ "mkdir -p" [mountpoint]
+
+      setupLoopDevices out
       cmd_ "mount -t btrfs" [out] mountpoint
 
       -- create new default subvolume, and then remount with it
@@ -218,6 +221,7 @@ idempotentMountImage imageFile mountPoint = do
   cmd_ "mkdir -p" [mountPoint]
   mounted <- cmd "mountpoint -q" [mountPoint] <&> (== ExitSuccess)
   when mounted $ cmd_ "umount" [mountPoint]
+
   cmd_ "mount -o compress,ro -t btrfs" [imageFile, mountPoint]
 
 addImageToBtrfs :: FilePath -> FilePath -> Action ()
@@ -313,6 +317,8 @@ chrootImage target args =
       cmd_ "cp --reflink=always" [inp, tmp]
       cmd_ "btrfstune -S0 -f" tmp
       cmd_ "mkdir" [mnt]
+
+      setupLoopDevices target
       cmd_ "mount -t btrfs" [tmp, mnt]
       let (umount :: IO ()) = do
             cmd_ "umount" [mnt]