iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream'
[automated-distro-installer]
/
fai
/
config
/
files
/
root
/
fai-check
/
VOL_BULLSEYE_BOOTSTRAP
diff --git
a/fai/config/files/root/fai-check/VOL_BULLSEYE_BOOTSTRAP
b/fai/config/files/root/fai-check/VOL_BULLSEYE_BOOTSTRAP
index 330efcc85c8cc4a812fd5859dfb3149a75155266..6717987e003a25502fc752c9eed6daadd2780d44 100755
(executable)
--- a/
fai/config/files/root/fai-check/VOL_BULLSEYE_BOOTSTRAP
+++ b/
fai/config/files/root/fai-check/VOL_BULLSEYE_BOOTSTRAP
@@
-58,11
+58,12
@@
for dev in $(btrfs fi show / | sed -rn 's#^\s*devid\s.*\s([^0-9 ]+)\S+$#\1#p' \
# Old partition scheme
grub_extn=${dev}4
elif [[ $(blockdev --getsize64 ${dev}5) == 8388608 ]]; then
# Old partition scheme
grub_extn=${dev}4
elif [[ $(blockdev --getsize64 ${dev}5) == 8388608 ]]; then
+ # Old partition scheme
grub_extn=${dev}5
else
grub_extn=${dev}7
fi
grub_extn=${dev}5
else
grub_extn=${dev}7
fi
- mount $
dev
/mnt
+ mount $
grub_extn
/mnt
if $first; then
if [[ -e /mnt/grubenv ]]; then
set -x
if $first; then
if [[ -e /mnt/grubenv ]]; then
set -x