From b3d3c2c98c317c40045a9bd610f38c056c651140 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Tue, 20 Aug 2019 16:37:23 +0200 Subject: [PATCH] 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 --- Makefile | 2 +- debian/qubes-core-agent.install | 1 + rpm_spec/core-agent.spec.in | 1 + vm-systemd/boot.automount.d/30_qubes.conf | 3 +++ 4 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 vm-systemd/boot.automount.d/30_qubes.conf diff --git a/Makefile b/Makefile index f70df85..8e56896 100644 --- a/Makefile +++ b/Makefile @@ -61,7 +61,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 diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install index 60b014e..f0f884d 100644 --- a/debian/qubes-core-agent.install +++ b/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 diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in index 22b7e19..90e2c01 100644 --- a/rpm_spec/core-agent.spec.in +++ b/rpm_spec/core-agent.spec.in @@ -834,6 +834,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 diff --git a/vm-systemd/boot.automount.d/30_qubes.conf b/vm-systemd/boot.automount.d/30_qubes.conf new file mode 100644 index 0000000..f6251ba --- /dev/null +++ b/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