summaryrefslogtreecommitdiff
path: root/src/initrd/btrfs-create.sh
diff options
context:
space:
mode:
Diffstat (limited to 'src/initrd/btrfs-create.sh')
-rw-r--r--src/initrd/btrfs-create.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/initrd/btrfs-create.sh b/src/initrd/btrfs-create.sh
index 969ddf6..02ce257 100644
--- a/src/initrd/btrfs-create.sh
+++ b/src/initrd/btrfs-create.sh
@@ -287,7 +287,10 @@ open_samizdat()
287 modprobe btrfs || return 287 modprobe btrfs || return
288 btrfs device scan -u || true 288 btrfs device scan -u || true
289 btrfs device scan || return 289 btrfs device scan || return
290 btrfs device ready "$blockdev" || true 290 if ! btrfs device ready "$blockdev"
291 then
292 : btrfs device ready failed, continuing anyway
293 fi
291 mount -t btrfs "$blockdev" /root || return 294 mount -t btrfs "$blockdev" /root || return
292 samizdat_movemounts "$imgfile" 295 samizdat_movemounts "$imgfile"
293 LoSetup -D 296 LoSetup -D
@@ -417,7 +420,6 @@ init_gpg()
417 420
418 local LOG_DIR=/run/initramfs/samizdat/log 421 local LOG_DIR=/run/initramfs/samizdat/log
419 if samizdat-password-agent > "$LOG_DIR"/samizdat-password-agent.log 2>&1; then 422 if samizdat-password-agent > "$LOG_DIR"/samizdat-password-agent.log 2>&1; then
420 clear
421 true 423 true
422 else 424 else
423 echo 'samizdat-password-agent failed; continuing in hope of hope...' 425 echo 'samizdat-password-agent failed; continuing in hope of hope...'