From a9ece6f706900621ea817f8d1bd5f4851adfed68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Fri, 7 Jul 2017 20:35:13 +0200
Subject: [PATCH] Remove qubes-netvm.service

Since qubesd properly handle chained startup of sys-net->sys-firewall
etc, we don't need a separate service to start netvm explicitly earlier.

Fixes QubesOS/qubes-issues#2533
---
 linux/systemd/Makefile                       |  1 -
 linux/systemd/qubes-netvm.service            | 17 -----------------
 linux/systemd/qubes-reload-firewall@.service |  1 -
 linux/systemd/qubes-vm@.service              |  1 -
 rpm_spec/core-dom0.spec                      |  4 ----
 5 files changed, 24 deletions(-)
 delete mode 100644 linux/systemd/qubes-netvm.service

diff --git a/linux/systemd/Makefile b/linux/systemd/Makefile
index 1ba1d355..5566870c 100644
--- a/linux/systemd/Makefile
+++ b/linux/systemd/Makefile
@@ -6,7 +6,6 @@ all:
 install:
 	mkdir -p $(DESTDIR)$(UNITDIR)
 	cp qubes-core.service $(DESTDIR)$(UNITDIR)
-	cp qubes-netvm.service $(DESTDIR)$(UNITDIR)
 	cp qubes-vm@.service $(DESTDIR)$(UNITDIR)
 	cp qubes-reload-firewall@.service $(DESTDIR)$(UNITDIR)
 	cp qubes-reload-firewall@.timer $(DESTDIR)$(UNITDIR)
diff --git a/linux/systemd/qubes-netvm.service b/linux/systemd/qubes-netvm.service
deleted file mode 100644
index 4c201cee..00000000
--- a/linux/systemd/qubes-netvm.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Qubes NetVM startup
-After=qubes-core.service qubes-qmemman.service libvirtd.service
-Before=systemd-user-sessions.service
-
-[Service]
-Type=oneshot
-Group=qubes
-Environment=DISPLAY=:0
-RemainAfterExit=yes
-KillMode=none
-ExecStart=/bin/sh -c 'NETVM=`qubes-prefs --force-root default-netvm`; [ -n "$NETVM" ] && qvm-start -q --no-guid $NETVM'
-
-[Install]
-WantedBy=multi-user.target
-# Cover legacy init.d script
-Alias=qubes_netvm.service
diff --git a/linux/systemd/qubes-reload-firewall@.service b/linux/systemd/qubes-reload-firewall@.service
index c8ee660e..ac5cb5d8 100644
--- a/linux/systemd/qubes-reload-firewall@.service
+++ b/linux/systemd/qubes-reload-firewall@.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=Reload firewall for VM %i
-After=qubes-netvm.service
 
 [Service]
 Type=simple
diff --git a/linux/systemd/qubes-vm@.service b/linux/systemd/qubes-vm@.service
index d64e2aba..1ef3354d 100644
--- a/linux/systemd/qubes-vm@.service
+++ b/linux/systemd/qubes-vm@.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=Start Qubes VM %i
-After=qubes-netvm.service
 Before=systemd-user-sessions.service
 
 [Service]
diff --git a/rpm_spec/core-dom0.spec b/rpm_spec/core-dom0.spec
index 75edab27..a48dc718 100644
--- a/rpm_spec/core-dom0.spec
+++ b/rpm_spec/core-dom0.spec
@@ -144,7 +144,6 @@ make -C doc DESTDIR=$RPM_BUILD_ROOT \
 
 %post
 %systemd_post qubes-core.service
-%systemd_post qubes-netvm.service
 %systemd_post qubes-qmemman.service
 %systemd_post qubesd.service
 
@@ -180,7 +179,6 @@ fi
 
 %preun
 %systemd_preun qubes-core.service
-%systemd_preun qubes-netvm.service
 %systemd_preun qubes-qmemman.service
 %systemd_preun qubesd.service
 
@@ -192,7 +190,6 @@ fi
 
 %postun
 %systemd_postun qubes-core.service
-%systemd_postun qubes-netvm.service
 %systemd_postun_with_restart qubes-qmemman.service
 %systemd_postun_with_restart qubesd.service
 
@@ -391,7 +388,6 @@ fi
 /usr/lib/qubes/startup-misc.sh
 /usr/libexec/qubes/qubesd-query-fast
 %{_unitdir}/qubes-core.service
-%{_unitdir}/qubes-netvm.service
 %{_unitdir}/qubes-qmemman.service
 %{_unitdir}/qubes-vm@.service
 %{_unitdir}/qubesd.service