initrd fixes: calls to "btrfs device ready"

2 files changed, 6 insertions, 0 deletions

diff --git a/src/initrd/btrfs-create.sh b/src/initrd/btrfs-create.sh
index c3cfcbb..c599ceb 100644
--- a/src/initrd/btrfs-create.sh
+++ b/src/initrd/btrfs-create.sh
@@ -285,7 +285,9 @@ open_samizdat()
      losetup_layers
   fi
   modprobe btrfs || return
+  btrfs device scan -u || true
   btrfs device scan || return
+  btrfs device ready "$blockdev" || return
   mount -t btrfs "$blockdev" /root || return
   samizdat_movemounts "$imgfile"
   LoSetup -D
diff --git a/src/initrd/grok-block b/src/initrd/grok-block
index f925061..dd6b533 100755
--- a/src/initrd/grok-block
+++ b/src/initrd/grok-block
@@ -194,6 +194,10 @@ grok_block()
           ;;
   esac
 
+  if [ "$ID_FS_TYPE" = btrfs ]; then
+    btrfs device ready "$DEVNAME"
+  fi
+
   if [ "$ID_FS_TYPE" = hfsplus ] && ! fsck.hfsplus -q "$DEVNAME"; then
     (if fsck.hfsplus "$DEVNAME"; then
       grok-block "$DEVNAME"