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
various fixes and dns changes
[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..cff15ed664f9ff77fcbc1d08f3f870f903ca0103 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,17
@@
case $1 in
;;
esac
;;
esac
+
first=true
for dev in $(btrfs fi show / | sed -rn 's#^\s*devid\s.*\s([^0-9 ]+)\S+$#\1#p' \
|sort); do
first=true
for dev in $(btrfs fi show / | sed -rn 's#^\s*devid\s.*\s([^0-9 ]+)\S+$#\1#p' \
|sort); do
- dev+=4
+
+ if [[ $(blockdev --getsize64 ${boot_disk}4) == 8388608 ]]; then
+ # old partition scheme
+ dev+=4
+ else
+ dev+=5
+ fi
mount $dev /mnt
if $first; then
if [[ -e /mnt/grubenv ]]; then
mount $dev /mnt
if $first; then
if [[ -e /mnt/grubenv ]]; then