Merge remote-tracking branch 'qubesos/pr/18'

* qubesos/pr/18:
  Enable xendriverdomain.service in 75-qubes-vm.preset
  Remove 'if true' wrapper from 06a0d30d50ce4ea266532c06ef24880bf5363c1b
  *Do* block until good random is available again
  dvm, then xendriverdomain, then qrexec-agent

vm-systemd/75-qubes-vm.preset

@@ -74,3 +74,4 @@ enable qubes-iptables.service
 enable qubes-random-seed.service
 enable haveged.service
 enable chronyd.service
+enable xendriverdomain.service

vm-systemd/prepare-dvm.sh

@@ -9,19 +9,16 @@ possibly_run_save_script()
 	DISPLAY=:0 su - user -c /tmp/qubes-save-script
 }
 
-if true; then
-    echo user | /bin/sh /etc/qubes-rpc/qubes.WaitForSession
-    possibly_run_save_script
-    umount /rw
-    dmesg -c >/dev/null
-    qubesdb-watch /qubes-restore-complete &
-    watch_pid=$!
-    free | grep Mem: |
-        (read label total used free shared buffers cached; qubesdb-write /qubes-used-mem $(( $used + $cached )) )
-    # we're still running in DispVM template
-    echo "Waiting for save/restore..."
-    qubesdb-read /qubes-restore-complete || wait $watch_pid
-    echo Back to life.
-    systemctl --no-block restart qubes-random-seed.service
-fi
-
+echo user | /bin/sh /etc/qubes-rpc/qubes.WaitForSession
+possibly_run_save_script
+umount /rw
+dmesg -c >/dev/null
+qubesdb-watch /qubes-restore-complete &
+watch_pid=$!
+free | grep Mem: |
+    (read label total used free shared buffers cached; qubesdb-write /qubes-used-mem $(( $used + $cached )) )
+# we're still running in DispVM template
+echo "Waiting for save/restore..."
+qubesdb-read /qubes-restore-complete || wait $watch_pid
+echo Back to life.
+systemctl restart qubes-random-seed.service

vm-systemd/qubes-dvm.service

@@ -2,6 +2,7 @@
 Description=Prepare Qubes DispVM Template
 ConditionPathExists=/var/run/qubes-service/qubes-dvm
 After=systemd-readahead-replay.service
+Before=xendriverdomain.service
 
 [Service]
 Type=oneshot

vm-systemd/qubes-qrexec-agent.service

@@ -1,6 +1,6 @@
 [Unit]
 Description=Qubes remote exec agent
-After=qubes-dvm.service
+After=qubes-dvm.service xendriverdomain.service
 
 [Service]
 ExecStartPre=/bin/sh -c '[ -e /dev/xen/evtchn ] || modprobe xen_evtchn'