This is how the Ubuntu 20.04 installer configures the ESP to mount at /boot/efi, so it should be fine to use this convention everywhere. /dev/md0's /dev/disk/by-uuid entry does not show up immediately, so I removed the swapon there. Signed-off-by: Richard Laager <rlaager@wiktel.com>