Skip to content

qubes-core-agent: remove conflict with firewalld #581

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

Merged
merged 2 commits into from
Jun 21, 2025
Merged

qubes-core-agent: remove conflict with firewalld #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dae1ac6
qubes-core-agent: remove conflict with firewalld
Jun 19, 2025
bd9945f
disable firewalld by default
Jun 19, 2025
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
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ SYSTEM_DROPINS += cups.service cups-browsed.service cups.path cups.socket ModemM
SYSTEM_DROPINS += [email protected] [email protected]
SYSTEM_DROPINS += tmp.mount
SYSTEM_DROPINS += org.cups.cupsd.service org.cups.cupsd.path org.cups.cupsd.socket
SYSTEM_DROPINS += firewalld.service
SYSTEM_DROPINS += systemd-random-seed.service
SYSTEM_DROPINS += tor.service [email protected]
SYSTEM_DROPINS += systemd-timesyncd.service
Expand Down
1 change: 0 additions & 1 deletion debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ Recommends:
xterm
Conflicts:
qubes-core-agent-linux,
firewalld,
qubes-core-vm-sysvinit,
qubes-gui-agent (<< 4.1.6-1),
pulseaudio-qubes (<< 4.2.0-1),
Expand Down
1 change: 1 addition & 0 deletions debian/qubes-core-agent.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ lib/systemd/system/cups.service.d/30_qubes.conf
lib/systemd/system/cups.socket.d/30_qubes.conf
lib/systemd/system/cups-browsed.service.d/30_qubes.conf
lib/systemd/system/exim4.service.d/30_qubes.conf
lib/systemd/system/firewalld.service.d/30_qubes.conf
lib/systemd/system/[email protected]/30_qubes.conf
lib/systemd/system/netfilter-persistent.service.d/30_qubes.conf
lib/systemd/system/org.cups.cupsd.path.d/30_qubes.conf
Expand Down
2 changes: 1 addition & 1 deletion rpm_spec/core-agent.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ Vendor: Invisible Things Lab
License: GPL
URL: https://www.qubes-os.org

Conflicts: firewalld
Requires: xdg-utils
Requires: qubes-utils >= 3.1.3
Requires: qubes-utils-libs >= 4.3.1
Expand Down Expand Up @@ -1299,6 +1298,7 @@ The Qubes core startup configuration for SystemD init.
%_unitdir/org.cups.cupsd.socket.d/30_qubes.conf
%dir %_unitdir/org.cups.cupsd.path.d
%_unitdir/org.cups.cupsd.path.d/30_qubes.conf
%_unitdir/firewalld.service.d/30_qubes.conf
%_unitdir/[email protected]/30_qubes.conf
%_unitdir/ModemManager.service.d/30_qubes.conf
%_unitdir/NetworkManager.service.d/30_qubes.conf
Expand Down
1 change: 1 addition & 0 deletions vm-systemd/75-qubes-vm.preset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
disable avahi.service
disable avahi-daemon.service
disable avahi-daemon.socket
disable firewalld.service

# Fedora only services
disable rpcbind.service
Expand Down
3 changes: 3 additions & 0 deletions vm-systemd/firewalld.service.d/30_qubes.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[Unit]
ConditionPathExists=/var/run/qubes-service/firewalld
After=qubes-firewall.service