Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove qubes-netvm.service

Browse Source 
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
This commit is contained in:
Marek Marczykowski-Górecki 2017-07-07 20:35:13 +02:00
parent d9db4f747c
commit a9ece6f706
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
5 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
linux/systemd/Makefile
View File

@ -6,7 +6,6 @@ all:
install: install:
mkdir -p $(DESTDIR)$(UNITDIR) mkdir -p $(DESTDIR)$(UNITDIR)
cp qubes-core.service $(DESTDIR)$(UNITDIR) cp qubes-core.service $(DESTDIR)$(UNITDIR)
cp qubes-netvm.service $(DESTDIR)$(UNITDIR)
cp qubes-vm@.service $(DESTDIR)$(UNITDIR) cp qubes-vm@.service $(DESTDIR)$(UNITDIR)
cp qubes-reload-firewall@.service $(DESTDIR)$(UNITDIR) cp qubes-reload-firewall@.service $(DESTDIR)$(UNITDIR)
cp qubes-reload-firewall@.timer $(DESTDIR)$(UNITDIR) cp qubes-reload-firewall@.timer $(DESTDIR)$(UNITDIR)

17
linux/systemd/qubes-netvm.service
View File

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

1
linux/systemd/qubes-reload-firewall@.service
View File

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

1
linux/systemd/qubes-vm@.service
View File

@ -1,6 +1,5 @@
[Unit] [Unit]
Description=Start Qubes VM %i Description=Start Qubes VM %i
After=qubes-netvm.service
Before=systemd-user-sessions.service Before=systemd-user-sessions.service
[Service] [Service]

4
rpm_spec/core-dom0.spec
View File

@ -144,7 +144,6 @@ make -C doc DESTDIR=$RPM_BUILD_ROOT \
%post %post
%systemd_post qubes-core.service %systemd_post qubes-core.service
%systemd_post qubes-netvm.service
%systemd_post qubes-qmemman.service %systemd_post qubes-qmemman.service
%systemd_post qubesd.service %systemd_post qubesd.service
@ -180,7 +179,6 @@ fi
%preun %preun
%systemd_preun qubes-core.service %systemd_preun qubes-core.service
%systemd_preun qubes-netvm.service
%systemd_preun qubes-qmemman.service %systemd_preun qubes-qmemman.service
%systemd_preun qubesd.service %systemd_preun qubesd.service
@ -192,7 +190,6 @@ fi
%postun %postun
%systemd_postun qubes-core.service %systemd_postun qubes-core.service
%systemd_postun qubes-netvm.service
%systemd_postun_with_restart qubes-qmemman.service %systemd_postun_with_restart qubes-qmemman.service
%systemd_postun_with_restart qubesd.service %systemd_postun_with_restart qubesd.service
@ -391,7 +388,6 @@ fi
/usr/lib/qubes/startup-misc.sh /usr/lib/qubes/startup-misc.sh
/usr/libexec/qubes/qubesd-query-fast /usr/libexec/qubes/qubesd-query-fast
%{_unitdir}/qubes-core.service %{_unitdir}/qubes-core.service
%{_unitdir}/qubes-netvm.service
%{_unitdir}/qubes-qmemman.service %{_unitdir}/qubes-qmemman.service
%{_unitdir}/qubes-vm@.service %{_unitdir}/qubes-vm@.service
%{_unitdir}/qubesd.service %{_unitdir}/qubesd.service