Merge remote-tracking branch 'origin/pr/368'

* origin/pr/368:
  Disable renaming Xen's eth0 to enX0
  Wait for fully starting user systemd session

Makefile

@@ -108,12 +108,13 @@ SYSTEMD_NETWORK_SERVICES := vm-systemd/qubes-firewall.service vm-systemd/qubes-i
 SYSTEMD_CORE_SERVICES := $(filter-out $(SYSTEMD_NETWORK_SERVICES), $(SYSTEMD_ALL_SERVICES))
 
 install-systemd: install-init
-	install -d $(DESTDIR)$(SYSLIBDIR)/systemd/system{,-preset} $(DESTDIR)$(LIBDIR)/qubes/init $(DESTDIR)$(SYSLIBDIR)/modules-load.d $(DESTDIR)/etc/systemd/system
+	install -d $(DESTDIR)$(SYSLIBDIR)/systemd/system{,-preset} $(DESTDIR)$(LIBDIR)/qubes/init $(DESTDIR)$(SYSLIBDIR)/modules-load.d $(DESTDIR)/etc/systemd/system $(DESTDIR)$(SYSLIBDIR)/systemd/network
 	install -m 0644 $(SYSTEMD_CORE_SERVICES) $(DESTDIR)$(SYSLIBDIR)/systemd/system/
 	install -m 0644 vm-systemd/qubes-*.timer $(DESTDIR)$(SYSLIBDIR)/systemd/system/
 	install -m 0644 vm-systemd/75-qubes-vm.preset $(DESTDIR)$(SYSLIBDIR)/systemd/system-preset/
 	install -m 0644 vm-systemd/qubes-core.conf $(DESTDIR)$(SYSLIBDIR)/modules-load.d/
 	install -m 0644 vm-systemd/xendriverdomain.service $(DESTDIR)/etc/systemd/system/
+	install -m 0644 vm-systemd/80-qubes-vif.link $(DESTDIR)$(SYSLIBDIR)/systemd/network/
 
 install-sysvinit: install-init
 	install -d $(DESTDIR)/etc/init.d

debian/qubes-core-agent-networking.install

@@ -14,6 +14,7 @@ lib/systemd/system/qubes-network.service
 lib/systemd/system/qubes-network-uplink.service
 lib/systemd/system/[email protected]
 lib/systemd/system/qubes-updates-proxy.service
+lib/systemd/network/80-qubes-vif.link
 usr/lib/qubes/init/network-proxy-setup.sh
 usr/lib/qubes/init/network-proxy-stop.sh
 usr/lib/qubes/init/network-uplink-wait.sh

qubes-rpc/qubes.WaitForSession

@@ -6,3 +6,7 @@ while ! [ -e "/var/run/qubes/qrexec-server.$USERNAME.sock" ]
 do
     sleep 0.1
 done
+
+systemctl --machine="$USERNAME"@.host --user --wait --quiet is-system-running
+
+exit 0

rpm_spec/core-agent.spec.in

@@ -827,6 +827,7 @@ rm -f %{name}-%{version}
 /usr/lib/systemd/system/qubes-network-uplink.service
 /usr/lib/systemd/system/[email protected]
 /usr/lib/systemd/system/qubes-updates-proxy.service
+/usr/lib/systemd/network/80-qubes-vif.link
 /usr/lib/qubes/init/network-proxy-setup.sh
 /usr/lib/qubes/init/network-proxy-stop.sh
 /usr/lib/qubes/init/network-uplink-wait.sh

vm-systemd/80-qubes-vif.link

@@ -0,0 +1,13 @@
+# Disable renaming of Xen netfront interfaces, to avoid race conditions during
+# network configuration. systemd / udevd does not provide any way to
+# synchronize against interface rename operation when the device is not
+# detected yet.
+# Furthermore, setting SYSTEMD_WANTS in udev seems to not work when interface
+# is renamed.
+# See https://github.com/QubesOS/qubes-issues/issues/7284 for details.
+
+[Match]
+Driver=vif
+
+[Link]
+NamePolicy=