diff options
Diffstat (limited to 'src/initrd')
-rw-r--r-- | src/initrd/btrfs-create.sh | 2 | ||||
-rwxr-xr-x | src/initrd/grok-block | 4 |
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() | |||
285 | losetup_layers | 285 | losetup_layers |
286 | fi | 286 | fi |
287 | modprobe btrfs || return | 287 | modprobe btrfs || return |
288 | btrfs device scan -u || true | ||
288 | btrfs device scan || return | 289 | btrfs device scan || return |
290 | btrfs device ready "$blockdev" || return | ||
289 | mount -t btrfs "$blockdev" /root || return | 291 | mount -t btrfs "$blockdev" /root || return |
290 | samizdat_movemounts "$imgfile" | 292 | samizdat_movemounts "$imgfile" |
291 | LoSetup -D | 293 | 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() | |||
194 | ;; | 194 | ;; |
195 | esac | 195 | esac |
196 | 196 | ||
197 | if [ "$ID_FS_TYPE" = btrfs ]; then | ||
198 | btrfs device ready "$DEVNAME" | ||
199 | fi | ||
200 | |||
197 | if [ "$ID_FS_TYPE" = hfsplus ] && ! fsck.hfsplus -q "$DEVNAME"; then | 201 | if [ "$ID_FS_TYPE" = hfsplus ] && ! fsck.hfsplus -q "$DEVNAME"; then |
198 | (if fsck.hfsplus "$DEVNAME"; then | 202 | (if fsck.hfsplus "$DEVNAME"; then |
199 | grok-block "$DEVNAME" | 203 | grok-block "$DEVNAME" |