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
mostly fixes, one new partition option
[automated-distro-installer]
/
fai
/
config
/
scripts
/
GRUB_EFI
/
10-setup
diff --git
a/fai/config/scripts/GRUB_EFI/10-setup
b/fai/config/scripts/GRUB_EFI/10-setup
index f586ba1ebd0a915723fd905db96334d103d9ca04..7dd92d4f000ebc8a44569cc4b7be5c11d66fb98a 100755
(executable)
--- a/
fai/config/scripts/GRUB_EFI/10-setup
+++ b/
fai/config/scripts/GRUB_EFI/10-setup
@@
-24,7
+24,7
@@
if [ -z "$BOOT_DEVICE" ]; then
exit 189
fi
exit 189
fi
-# disable os-prober because of #
788062
+# disable os-prober because of #
802717
ainsl /etc/default/grub 'GRUB_DISABLE_OS_PROBER=true'
# skip the rest, if not an initial installation
ainsl /etc/default/grub 'GRUB_DISABLE_OS_PROBER=true'
# skip the rest, if not an initial installation
@@
-45,7
+45,7
@@
fi
if [[ $BOOT_DEVICE =~ '/dev/md' ]]; then
raiddev=${BOOT_DEVICE#/dev/}
# install grub on all members of RAID
if [[ $BOOT_DEVICE =~ '/dev/md' ]]; then
raiddev=${BOOT_DEVICE#/dev/}
# install grub on all members of RAID
- for device in
`LC_ALL=C perl -ne 'if(/^'$raiddev'\s.+raid\d+\s(.+)/){ $_=$1; s/\d+\[\d+\]//g; print }' /proc/mdstat`
; do
+ for device in
$(LC_ALL=C perl -ne 'if(/^'$raiddev'\s.+raid\d+\s(.+)/){ $_=$1; s/\d+\[\d+\]//g; print }' /proc/mdstat)
; do
echo Install grub on /dev/$device
$ROOTCMD grub-install --no-floppy --force-extra-removable "/dev/$device"
done
echo Install grub on /dev/$device
$ROOTCMD grub-install --no-floppy --force-extra-removable "/dev/$device"
done