Disable boot.automount which is created by systemd automatically

systemd-gpt-auto-generator creates boot.automount for existing ESP
partition. But Qubes templates have only placeholder ESP there, with no
even filesystem created. Disable it with drop-in file, until it will
become used.

Fixes QubesOS/qubes-issues#5261

(cherry picked from commit b3d3c2c)

Makefile

@@ -63,7 +63,7 @@ all:
 SYSTEM_DROPIN_DIR ?= "lib/systemd/system"
 USER_DROPIN_DIR ?= "usr/lib/systemd/user"
 
-SYSTEM_DROPINS := chronyd.service crond.service
+SYSTEM_DROPINS := boot.automount chronyd.service crond.service
 SYSTEM_DROPINS += cups.service cups-browsed.service cups.path cups.socket ModemManager.service
 SYSTEM_DROPINS += getty@tty.service
 SYSTEM_DROPINS += tmp.mount

debian/qubes-core-agent.install

@@ -55,6 +55,7 @@ etc/systemd/system/haveged.service
 etc/udev/rules.d/50-qubes-misc.rules
 lib/modules-load.d/qubes-core.conf
 lib/systemd/system-preset/75-qubes-vm.preset
+lib/systemd/system/boot.automount.d/30_qubes.conf
 lib/systemd/system/ModemManager.service.d/30_qubes.conf
 lib/systemd/system/NetworkManager-wait-online.service.d/30_qubes.conf
 lib/systemd/system/NetworkManager.service.d/30_qubes.conf

rpm_spec/core-agent.spec.in

@@ -861,6 +861,7 @@ The Qubes core startup configuration for SystemD init.
 /lib/systemd/system/qubes-updates-proxy-forwarder.socket
 /lib/systemd/system-preset/%qubes_preset_file
 /lib/modules-load.d/qubes-core.conf
+/lib/systemd/system/boot.automount.d/30_qubes.conf
 /lib/systemd/system/chronyd.service.d/30_qubes.conf
 /lib/systemd/system/crond.service.d/30_qubes.conf
 /lib/systemd/system/cups.service.d/30_qubes.conf

vm-systemd/boot.automount.d/30_qubes.conf

@@ -0,0 +1,3 @@
+[Unit]
+# disable automount ESP on /boot - there is no filesystem there yet
+ConditionPathExists=/nonexistent