Qubes R4.1: OS boot process fails when it is installed with the FS which does not support the discard flag

[arno01]

Qubes OS version
Qubes OS R4.1 built on 26 January 2020.
HW: MacBookPro14,3

Affected component(s) or functionality
Anaconda.
System boot process.

Brief summary
The boot process fails on boot-efi.mount because Anaconda added a ,discard flag to the /boot/efi hfsplus FS. And the hfsplus does not have discard FS option.
The issue is introduced by QubesOS/qubes-anaconda@6b81491

To Reproduce

1. Build Qubes R4.1 (off the repos dated 26 January 2020);
2. Create /boot/efi mountpoint with the hfsplus FS (or any other FS that does not support discards);
3. Finish the installation and reboot;

Expected behavior
The OS should boot after the installation.

Actual behavior

• boot-efi.mount (systemd) fails
• System gets stuck at Cannot open access to console, the root account is locked. (because I haven't created a root account, I had to use a rescue mode to fix the /etc/fstab file)

Screenshots
I can add some if you want.

Additional context
The problem is when one has /boot/efi with the FS which does not support ,discard option, e.g. hfsplus.

Solutions you've tried
Boot into rescue, remove ,discard option from the /boot/efi hfsplus FS in the /etc/fstab file.

Likely reverting QubesOS/qubes-anaconda@6b81491 will also help.

Relevant documentation you've consulted

QubesOS/qubes-anaconda@6b81491
QubesOS/qubes-anaconda#4

Related, non-duplicate issues

#3226