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

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

Browse Source 
* qubesos/pr/18:
  Enable xendriverdomain.service in 75-qubes-vm.preset
  Remove 'if true' wrapper from 06a0d30d50
  *Do* block until good random is available again
  dvm, then xendriverdomain, then qrexec-agent
This commit is contained in:
Marek Marczykowski-Górecki 2016-07-10 17:17:11 +02:00
commit 6bd6380918
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
4 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vm-systemd/75-qubes-vm.preset
View File

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

27
vm-systemd/prepare-dvm.sh
View File

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

1
vm-systemd/qubes-dvm.service
View File

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

2
vm-systemd/qubes-qrexec-agent.service
View File

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