Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Disable boot.automount which is created by systemd automatically

Browse Source 
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
This commit is contained in:
Marek Marczykowski-Górecki 2019-08-20 16:37:23 +02:00
parent c6f7984203
commit b3d3c2c98c
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -61,7 +61,7 @@ all:
SYSTEM_DROPIN_DIR ?= "lib/systemd/system" SYSTEM_DROPIN_DIR ?= "lib/systemd/system"
USER_DROPIN_DIR ?= "usr/lib/systemd/user" 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 += cups.service cups-browsed.service cups.path cups.socket ModemManager.service
SYSTEM_DROPINS += getty@tty.service SYSTEM_DROPINS += getty@tty.service
SYSTEM_DROPINS += tmp.mount SYSTEM_DROPINS += tmp.mount

1
debian/qubes-core-agent.install vendored
View File

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

1
rpm_spec/core-agent.spec.in
View File

@ -834,6 +834,7 @@ The Qubes core startup configuration for SystemD init.
/lib/systemd/system/qubes-updates-proxy-forwarder.socket /lib/systemd/system/qubes-updates-proxy-forwarder.socket
/lib/systemd/system-preset/%qubes_preset_file /lib/systemd/system-preset/%qubes_preset_file
/lib/modules-load.d/qubes-core.conf /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/chronyd.service.d/30_qubes.conf
/lib/systemd/system/crond.service.d/30_qubes.conf /lib/systemd/system/crond.service.d/30_qubes.conf
/lib/systemd/system/cups.service.d/30_qubes.conf /lib/systemd/system/cups.service.d/30_qubes.conf

3
vm-systemd/boot.automount.d/30_qubes.conf Normal file
View File

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