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

@@ -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)

linux/systemd/qubes-netvm.service

@@ -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

linux/systemd/qubes-reload-firewall@.service

@@ -1,6 +1,5 @@
 [Unit]
 Description=Reload firewall for VM %i
-After=qubes-netvm.service
 
 [Service]
 Type=simple

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]

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