static usb ethnet addresses

[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..ed8d878ae0395bee09028706c56e9a922fd26510 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
+# do only execute for Debian and similar distros
+if ! ifclass DEBIAN ; then
+    exit 0
+fi
+
 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'
 
+# 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
@@ -73,14 +83,16 @@ if [[ $BOOT_DEVICE =~ '/dev/md' ]]; then
     mbrdevices=${mbrdevices%, }
 else
   for dev in $BOOT_DEVICE; do
-    mbrdevices=$(get_stable_devname $dev)
+    mbrdev=$(get_stable_devname $dev)
     if [ -z "$mbrdevices" ]; then
       # if we cannot find a persistent name (for e.g. in a VM) use old name
-      mbrdevices=$dev
+      mbrdevices+="$dev, "
     fi
-    echo "Installing grub on $dev = $mbrdevices"
-    $ROOTCMD grub-install --no-floppy "$mbrdevices"
+    echo "Installing grub on $dev = $mbrdev"
+    $ROOTCMD grub-install --no-floppy "$mbrdev"
   done
+  # remove trailing ,
+  mbrdevices=${mbrdevices%, }
 fi
 
 echo "grub-pc grub-pc/install_devices multiselect $mbrdevices" | $ROOTCMD debconf-set-selections