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
minor improvements
[automated-distro-installer]
/
fai
/
config
/
scripts
/
GRUB_PC
/
10-setup
diff --git
a/fai/config/scripts/GRUB_PC/10-setup
b/fai/config/scripts/GRUB_PC/10-setup
index e26aa2671180c03eccc373cac1c9845eef818688..7ea23fd34295565d806df14fb8bd27af5f9af84b 100755
(executable)
--- a/
fai/config/scripts/GRUB_PC/10-setup
+++ b/
fai/config/scripts/GRUB_PC/10-setup
@@
-4,6
+4,11
@@
error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
set -x
error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
set -x
+# do only execute for Debian and similar distros
+if ! ifclass DEBIAN ; then
+ exit 0
+fi
+
set -a
# do not set up grub during dirinstall
set -a
# do not set up grub during dirinstall
@@
-20,6
+25,11
@@
fi
# disable os-prober because of #802717
ainsl /etc/default/grub 'GRUB_DISABLE_OS_PROBER=true'
# disable os-prober because of #802717
ainsl /etc/default/grub 'GRUB_DISABLE_OS_PROBER=true'
+# efivars may still be mounted from the host system during fai-diskimage
+if [ -d $target/sys/firmware/efi/efivars ]; then
+ umount $target/sys/firmware/efi/efivars
+fi
+
# skip the rest, if not an initial installation
if [ $FAI_ACTION != "install" ]; then
$ROOTCMD update-grub
# skip the rest, if not an initial installation
if [ $FAI_ACTION != "install" ]; then
$ROOTCMD update-grub
@@
-73,14
+83,17
@@
if [[ $BOOT_DEVICE =~ '/dev/md' ]]; then
mbrdevices=${mbrdevices%, }
else
for dev in $BOOT_DEVICE; do
mbrdevices=${mbrdevices%, }
else
for dev in $BOOT_DEVICE; do
- mbrdev
ices
=$(get_stable_devname $dev)
- if [ -z "$mbrdev
ices
" ]; then
+ mbrdev=$(get_stable_devname $dev)
+ if [ -z "$mbrdev" ]; then
# if we cannot find a persistent name (for e.g. in a VM) use old name
# if we cannot find a persistent name (for e.g. in a VM) use old name
- mbrdev
ices=$dev
+ mbrdev
="$dev"
fi
fi
- echo "Installing grub on $dev = $mbrdevices"
- $ROOTCMD grub-install --no-floppy "$mbrdevices"
+ mbrdevices+="$mbrdev, "
+ echo "Installing grub on $dev = $mbrdev"
+ $ROOTCMD grub-install --no-floppy "$mbrdev"
done
done
+ # remove trailing ,
+ mbrdevices=${mbrdevices%, }
fi
echo "grub-pc grub-pc/install_devices multiselect $mbrdevices" | $ROOTCMD debconf-set-selections
fi
echo "grub-pc grub-pc/install_devices multiselect $mbrdevices" | $ROOTCMD debconf-set-selections