From b28ae67d2dab41035d3fc786dbc417bd6d21f2d6 Mon Sep 17 00:00:00 2001
From: Andrew Cady <d@cryptonomic.net>
Date: Tue, 2 Mar 2021 14:05:58 -0500
Subject: initrd: menu-select: robustness

Try to make menu-select slightly more robust to being run a second time
after a failed run.
---
 src/initrd/menu-select | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/initrd/menu-select b/src/initrd/menu-select
index 8347c28..c374b29 100755
--- a/src/initrd/menu-select
+++ b/src/initrd/menu-select
@@ -85,6 +85,7 @@ case "$1" in
   boot-destroy-disk)
     dev="$2"
 
+    umount /plaintext || true
     partition_new_hard_drive_DESTROYING_EVERYTHING "$dev" || error
 
     mkfs.btrfs -f "$dev"2                                 || error
@@ -101,9 +102,10 @@ case "$1" in
   ;;
   boot-native)
     dev="$2"
-    init_gpg                                           || error
+    umount /plaintext || true
     mkdir /plaintext
     mount "$dev"2 /plaintext                           || error
+    init_gpg                                           || error
     open_samizdat_blockdev "$dev"3 /plaintext/disk.key || error
     open_samizdat                                      || error
     bootdone root-mounted
-- 
cgit v1.2.3