diff -uprN a/basic b/basic
--- a/basic	2016-11-21 16:42:50.000000000 +0000
+++ b/basic	2018-05-03 17:45:56.001563600 +0000
@@ -87,7 +87,11 @@ for dev in $DEVICES/*; do
 				fi
 				# base-passwd defines gid 46 as group plugdev
 				if [ "$method" != efi ]; then
-					options="$options,umask=007,gid=46"
+					if [ "$mountpoint" = "/boot/firmware" ]; then
+						options="defaults"
+					else
+						options="$options,umask=007,gid=46"
+					fi
 				fi
 				echo "$path" "$mountpoint" vfat $options 0 1
 			fi