diff -Nru fai-5.10.2/debian/changelog fai-5.10.3/debian/changelog
--- fai-5.10.2/debian/changelog	2021-04-14 13:58:20.000000000 +0200
+++ fai-5.10.3/debian/changelog	2021-05-22 18:34:45.000000000 +0200
@@ -1,3 +1,11 @@
+fai (5.10.3) unstable; urgency=low
+
+  * GRUB_PC/10-setup: fallback if pdevice is empty, Closes: #988987
+  * 85-efi-classes: use loop and change order of classes
+  * control: update standards version, no changes needed
+
+ -- Thomas Lange <lange@debian.org>  Sat, 22 May 2021 18:34:45 +0200
+
 fai (5.10.2) unstable; urgency=medium
 
   * make bullseye the default release, Closes: #986884
diff -Nru fai-5.10.2/debian/control fai-5.10.3/debian/control
--- fai-5.10.2/debian/control	2020-06-26 11:43:29.000000000 +0200
+++ fai-5.10.3/debian/control	2021-05-22 18:27:33.000000000 +0200
@@ -2,7 +2,7 @@
 Section: admin
 Priority: optional
 Maintainer: Thomas Lange <lange@debian.org>
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
 Build-Depends-Indep: asciidoc-dblatex, w3m, dblatex, docbook-xsl, libparse-recdescent-perl
 Build-Depends: debhelper-compat (= 12), debhelper (>= 11), libgraph-perl
 Vcs-Git: https://github.com/faiproject/fai.git
diff -Nru fai-5.10.2/examples/simple/class/85-efi-classes fai-5.10.3/examples/simple/class/85-efi-classes
--- fai-5.10.2/examples/simple/class/85-efi-classes	2021-02-04 14:09:32.000000000 +0100
+++ fai-5.10.3/examples/simple/class/85-efi-classes	2021-05-22 17:47:19.000000000 +0200
@@ -6,10 +6,9 @@
     exit 0
 fi
 
-if ifclass FAIBASE; then
-    echo FAIBASE_EFI
-elif ifclass FAISERVER; then
-    echo FAISERVER_EFI
-elif ifclass LVM; then
-    echo LVM_EFI
-fi
+for c in LVM FAISERVER FAIBASE; do
+    if ifclass $c; then
+	echo ${c}_EFI
+	break
+    fi
+done
diff -Nru fai-5.10.2/examples/simple/scripts/GRUB_PC/10-setup fai-5.10.3/examples/simple/scripts/GRUB_PC/10-setup
--- fai-5.10.2/examples/simple/scripts/GRUB_PC/10-setup	2021-02-26 10:27:39.000000000 +0100
+++ fai-5.10.3/examples/simple/scripts/GRUB_PC/10-setup	2021-05-22 17:49:43.000000000 +0200
@@ -59,6 +59,10 @@
     # 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; s/(nvme.+?)p/$1/g; print }' /proc/mdstat); do
 	pdevice=$(get_stable_devname /dev/$device)
+	if [ -z "$pdevice" ]; then
+	    # if we cannot find a persistent name (for e.g. in a VM) use old name
+	    pdevice="/dev/$device"
+	fi
 	mbrdevices+="$pdevice, "
 	echo Installing grub on /dev/$device = $pdevice
 	$ROOTCMD grub-install --no-floppy "/dev/$device"