misc fixes and improvements

[distro-setup] / zboot

diff --git a/zboot b/zboot
index 3a0a46a74b33be8da8b6ceb4e53b05db326b1966..4e4edce21a7ad5a97a6da4e9fcb0d7469b36fd6b 100755 (executable)
--- a/zboot
+++ b/zboot
@@ -19,6 +19,11 @@ source /usr/local/lib/err
 
 set -x
 
+if [[ ! -e /mnt/root/root2-fstab || ! -e /mnt/root/root2-crypttab ]]; then
+  echo $0: "error: create /mnt/root/root2-fstab & /mnt/root/root2-crypttab from running /a/bin/fai/fai/config/hooks/partition.DEFAULT mkroot2 or mkroot2tab"
+  exit 1
+fi
+
 mount -o bind /mnt/root2/root_ubuntubionic /mnt/1
 cd /mnt/1
 /b/ds/gen-amy-fstab ubuntubionic .