-$first_root_crypt / btrfs noatime,subvol=root_$DISTRO 0 0
-$first_root_crypt /mnt/root btrfs nofail,noatime,subvolid=0 0 0
-$first_boot_dev /boot btrfs nofail,noatime,subvol=$boot_vol 0 0
-$first_boot_dev /mnt/boot btrfs nofail,noatime,subvol=subvolid=0 0 0
+$first_root_crypt / btrfs noatime,subvol=root_$DISTRO$mopts 0 0
+$first_root_crypt /mnt/root btrfs nofail,noatime,subvolid=0$mopts 0 0
+$first_boot_dev /boot btrfs nofail,noatime,subvol=$boot_vol 0 0
+$first_efi /boot/efi vfat nofail 0 0
+$first_boot_dev /mnt/boot btrfs nofail,noatime,subvolid=0 0 0