From 4d6d6c913aa99fea6e706127ebf2d236e8774a24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Wed, 17 May 2017 02:11:03 +0200
Subject: [PATCH] qubesd: make sure NOTIFY_SOCKET variable is not propagated

qubesd do start other daemons - make sure they will not try to signal
systemd about it. In some cases such daemons (qubesdb-daemon) behave
differently based on this variable.
---
 qubes/tools/qubesd.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qubes/tools/qubesd.py b/qubes/tools/qubesd.py
index 48840c57..f51a55f5 100644
--- a/qubes/tools/qubesd.py
+++ b/qubes/tools/qubesd.py
@@ -217,6 +217,8 @@ def main(args=None):
             sighandler, loop, signame, server, server_internal)
 
     qubes.utils.systemd_notify()
+    # make sure children will not inherit this
+    os.environ.pop('NOTIFY_SOCKET', None)
 
     try:
         loop.run_forever()