Skip to content

Restart qrexec-agent on update #205

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
marmarek merged 2 commits into from
May 24, 2025
Merged

Restart qrexec-agent on update #205

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
27facce
Restart qrexec-agent on update
marmarek May 18, 2025
39f349a
rpm: fix systemd unit installation
marmarek May 24, 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
9 changes: 5 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ PYTHON ?= python3
export PYTHON CC MAKEFLAGS CFLAGS

SYSLIBDIR ?= /lib
UNITDIR ?= $(SYSLIBDIR)/systemd/system

help:
:
Expand Down Expand Up @@ -66,8 +67,8 @@ install-dom0: all-dom0
install -t $(DESTDIR)/etc/qubes/policy.d -m 664 policy.d/README
install -d $(DESTDIR)/etc/qubes/policy.d/include -m 775
install -t $(DESTDIR)/etc/qubes/policy.d/include -m 664 policy.d/include/*
install -d $(DESTDIR)/lib/systemd/system -m 755
install -t $(DESTDIR)/lib/systemd/system -m 644 systemd/qubes-qrexec-policy-daemon.service
install -d $(DESTDIR)$(UNITDIR) -m 755
install -t $(DESTDIR)$(UNITDIR) -m 644 systemd/qubes-qrexec-policy-daemon.service
install -m 755 -d $(DESTDIR)/usr/lib/tmpfiles.d/
install -m 0644 -t $(DESTDIR)/usr/lib/tmpfiles.d/ systemd/qrexec.conf
.PHONY: install-dom0
Expand All @@ -81,8 +82,8 @@ all-vm-selinux:

install-vm: all-vm
+$(MAKE) install -C agent
install -d $(DESTDIR)/$(SYSLIBDIR)/systemd/system -m 755
install -t $(DESTDIR)/$(SYSLIBDIR)/systemd/system -m 644 systemd/qubes-qrexec-agent.service
install -d $(DESTDIR)$(UNITDIR) -m 755
install -t $(DESTDIR)$(UNITDIR) -m 644 systemd/qubes-qrexec-agent.service
install -m 0644 -D qubes-rpc-config/README $(DESTDIR)/etc/qubes/rpc-config/README
install-vm-selinux:
install -m 0644 -D -t $(DESTDIR)/usr/share/selinux/packages selinux/qubes-core-qrexec.pp
Expand Down
3 changes: 0 additions & 3 deletions debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,5 @@ override_dh_auto_install:
make install-base
make install-vm

override_dh_systemd_start:
dh_systemd_start --no-restart-on-upgrade

override_dh_install:
dh_install --fail-missing
2 changes: 1 addition & 1 deletion rpm_spec/qubes-qrexec-dom0.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ rm -f %{name}-%{version}
%{_sysconfdir}/qubes-rpc/policy.include.Remove
%{_tmpfilesdir}/qrexec.conf

/lib/systemd/system/qubes-qrexec-policy-daemon.service
%{_unitdir}/qubes-qrexec-policy-daemon.service

%changelog
@CHANGELOG@
5 changes: 4 additions & 1 deletion rpm_spec/qubes-qrexec-vm.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ rm -f %{name}-%{version}
%preun
%systemd_preun qubes-qrexec-agent.service

%postun
%systemd_postun_with_restart qubes-qrexec-agent.service

%pre selinux
%selinux_relabel_pre

Expand Down Expand Up @@ -137,7 +140,7 @@ fi
/usr/lib/qubes/qrexec-agent
/usr/lib/qubes/qrexec-client-vm
/usr/lib/qubes/qrexec_client_vm
/lib/systemd/system/qubes-qrexec-agent.service
%{_unitdir}/qubes-qrexec-agent.service

%files selinux
%{_datadir}/selinux/devel/include/contrib/ipp-qubes-core-qrexec.if
Expand Down