minor fixes

[automated-distro-installer] / fai / config / files / root / fai-check / VOL_BUSTER_BOOTSTRAP

diff --git a/fai/config/files/root/fai-check/VOL_BUSTER_BOOTSTRAP b/fai/config/files/root/fai-check/VOL_BUSTER_BOOTSTRAP
index 283bbf66610efff9f2fc3cf4e11875d4cf48a3a0..e1b0b79a7bfbceab8b050cf97fd418af24241eb9 100755 (executable)
--- a/fai/config/files/root/fai-check/VOL_BUSTER_BOOTSTRAP
+++ b/fai/config/files/root/fai-check/VOL_BUSTER_BOOTSTRAP
@@ -47,10 +47,22 @@ case $1 in
     ;;
 esac
 
+
 first=true
 for dev in $(btrfs fi show / | sed -rn 's#^\s*devid\s.*\s([^0-9 ]+)\S+$#\1#p' \
                |sort); do
-  dev+=4
+
+  # Decide which is my grub_ext partition. see partition.DEFAULT file
+  # for details
+  if [[ $(blockdev --getsize64 ${dev}4) == 8388608 ]]; then
+    # Old partition scheme
+    grub_extn=${dev}4
+  elif [[ $(blockdev --getsize64 ${dev}5) == 8388608 ]]; then
+    grub_extn=${dev}5
+  else
+    grub_extn=${dev}7
+  fi
+  fi
   mount $dev /mnt
   if $first; then
     if [[ -e /mnt/grubenv ]]; then