Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable systemd-nsresourced and systemd-userdbd for minimal sys-net and minimal sys-usb #554

Merged
merged 1 commit into from
Feb 24, 2025
Merged

Disable systemd-nsresourced and systemd-userdbd for minimal sys-net and minimal sys-usb #554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@ endif
SYSTEM_DROPINS += polkit.service
SYSTEM_DROPINS += abrtd.service
SYSTEM_DROPINS += bluetooth.service
SYSTEM_DROPINS += systemd-nsresourced.service
SYSTEM_DROPINS += systemd-nsresourced.socket
SYSTEM_DROPINS += systemd-userdbd.service
SYSTEM_DROPINS += systemd-userdbd.socket

SYSTEM_DROPINS_NETWORKING := NetworkManager.service NetworkManager-wait-online.service
SYSTEM_DROPINS_NETWORKING += tinyproxy.service
Expand Down
4 changes: 4 additions & 0 deletions debian/qubes-core-agent.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@ lib/systemd/system/[email protected]/30_qubes.conf
lib/systemd/system/sysinit.target.d/30_qubes.conf
lib/systemd/system/systemd-timesyncd.service.d/30_qubes.conf
lib/systemd/system/systemd-logind.service.d/30_qubes.conf
lib/systemd/system/systemd-nsresourced.service.d/30_qubes.conf
lib/systemd/system/systemd-nsresourced.socket.d/30_qubes.conf
lib/systemd/system/systemd-userdbd.service.d/30_qubes.conf
lib/systemd/system/systemd-userdbd.socket.d/30_qubes.conf
lib/systemd/resolved.conf.d/30_resolved-no-mdns-or-llmnr.conf
usr/lib/sysctl.d/20-qubes-core.conf
usr/lib/systemd/user/tracker-extract-3.service.d/30_qubes.conf
Expand Down
4 changes: 4 additions & 0 deletions rpm_spec/core-agent.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1310,6 +1310,10 @@ The Qubes core startup configuration for SystemD init.
%_unitdir/tmp.mount.d/30_qubes.conf
%dir %_unitdir/sysinit.target.d
%_unitdir/sysinit.target.d/30_qubes.conf
%_unitdir/systemd-nsresourced.service.d/30_qubes.conf
%_unitdir/systemd-nsresourced.socket.d/30_qubes.conf
%_unitdir/systemd-userdbd.service.d/30_qubes.conf
%_unitdir/systemd-userdbd.socket.d/30_qubes.conf
%dir %_userunitdir/*.service.d
%_userunitdir/tracker-extract-3.service.d/30_qubes.conf
%_userunitdir/tracker-miner-fs-3.service.d/30_qubes.conf
Expand Down
5 changes: 5 additions & 0 deletions vm-systemd/systemd-nsresourced.service.d/30_qubes.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[Unit]
# Needs to be started as it creates /var/run/qubes-service/* files
After=qubes-sysinit.service
ConditionPathExists=!/var/run/qubes-service/minimal-netvm
ConditionPathExists=!/var/run/qubes-service/minimal-usbvm
5 changes: 5 additions & 0 deletions vm-systemd/systemd-nsresourced.socket.d/30_qubes.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[Unit]
# Needs to be started as it creates /var/run/qubes-service/* files
After=qubes-sysinit.service
ConditionPathExists=!/var/run/qubes-service/minimal-netvm
ConditionPathExists=!/var/run/qubes-service/minimal-usbvm
5 changes: 5 additions & 0 deletions vm-systemd/systemd-userdbd.service.d/30_qubes.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[Unit]
# Needs to be started as it creates /var/run/qubes-service/* files
After=qubes-sysinit.service
ConditionPathExists=!/var/run/qubes-service/minimal-netvm
ConditionPathExists=!/var/run/qubes-service/minimal-usbvm
5 changes: 5 additions & 0 deletions vm-systemd/systemd-userdbd.socket.d/30_qubes.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[Unit]
# Needs to be started as it creates /var/run/qubes-service/* files
After=qubes-sysinit.service
ConditionPathExists=!/var/run/qubes-service/minimal-netvm
ConditionPathExists=!/var/run/qubes-service/minimal-usbvm