diff --git a/debian/control b/debian/control index 18de8201..4c70f837 100644 --- a/debian/control +++ b/debian/control @@ -41,7 +41,6 @@ Depends: util-linux, e2fsprogs, parted, - python3-daemon, python3-qubesdb, python3-gi, python3-xdg, diff --git a/qubesagent/firewall.py b/qubesagent/firewall.py index 8264f453..1634329d 100755 --- a/qubesagent/firewall.py +++ b/qubesagent/firewall.py @@ -27,7 +27,6 @@ import subprocess import pwd import shutil -import daemon import qubesdb import sys @@ -635,15 +634,8 @@ def main(): else: print('Sorry, iptables no longer supported', file=sys.stderr) sys.exit(1) - context = daemon.DaemonContext() - context.stderr = sys.stderr - context.detach_process = False - context.files_preserve = [worker.qdb.watch_fd()] - context.signal_map = { - signal.SIGTERM: lambda _signal, _stack: worker.terminate(), - } - with context: - worker.main() + signal.signal(signal.SIGTERM, lambda _signal, _stack: worker.terminate()) + worker.main() if __name__ == '__main__': diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in index 70082a19..b3637553 100644 --- a/rpm_spec/core-agent.spec.in +++ b/rpm_spec/core-agent.spec.in @@ -146,11 +146,6 @@ Requires: python%{python3_pkgversion}-dbus %endif # for qubes-session-autostart, xdg-icon Requires: python%{python3_pkgversion}-pyxdg -%if 0%{?is_opensuse} -Requires: python%{python3_pkgversion}-python-daemon -%else -Requires: python%{python3_pkgversion}-daemon -%endif # for qvm-feature-request Requires: python%{python3_pkgversion}-qubesdb # for qubes.ShowInTerminal RPC service