suzanne.soy/qubes-core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

systemd: actually enable qubes-random-seed service

Browse Source 
QubesOS/qubes-issues#1311

(cherry picked from commit 7963fb91c7)

Conflicts:
	rpm_spec/core-vm.spec
	vm-systemd/75-qubes-vm.preset
This commit is contained in:
Marek Marczykowski-Górecki 2015-10-10 02:33:16 +02:00
parent be9fdeb258
commit e0a5b709c5
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rpm_spec/core-vm.spec
View File

@ -533,6 +533,7 @@ The Qubes core startup configuration for SystemD init.
/lib/systemd/system/qubes-update-check.timer /lib/systemd/system/qubes-update-check.timer
/lib/systemd/system/qubes-updates-proxy.service /lib/systemd/system/qubes-updates-proxy.service
/lib/systemd/system/qubes-qrexec-agent.service /lib/systemd/system/qubes-qrexec-agent.service
/lib/systemd/system/qubes-random-seed.service
/lib/systemd/system-preset/75-qubes-vm.preset /lib/systemd/system-preset/75-qubes-vm.preset
/lib/modules-load.d/qubes-core.conf /lib/modules-load.d/qubes-core.conf
/lib/modules-load.d/qubes-misc.conf /lib/modules-load.d/qubes-misc.conf
@ -542,6 +543,7 @@ The Qubes core startup configuration for SystemD init.
/usr/lib/qubes/init/misc-post.sh /usr/lib/qubes/init/misc-post.sh
/usr/lib/qubes/init/misc-post-stop.sh /usr/lib/qubes/init/misc-post-stop.sh
/usr/lib/qubes/init/mount-home.sh /usr/lib/qubes/init/mount-home.sh
/usr/lib/qubes/init/qubes-random-seed.sh
/usr/lib/qubes/init/qubes-sysinit.sh /usr/lib/qubes/init/qubes-sysinit.sh
/lib/systemd/system/chronyd.service.d/30_qubes.conf /lib/systemd/system/chronyd.service.d/30_qubes.conf
/lib/systemd/system/crond.service.d/30_qubes.conf /lib/systemd/system/crond.service.d/30_qubes.conf
@ -564,6 +566,7 @@ else
services="qubes-dvm qubes-misc-post qubes-firewall qubes-mount-home" services="qubes-dvm qubes-misc-post qubes-firewall qubes-mount-home"
services="$services qubes-netwatcher qubes-network qubes-sysinit" services="$services qubes-netwatcher qubes-network qubes-sysinit"
services="$services qubes-updates-proxy qubes-qrexec-agent" services="$services qubes-updates-proxy qubes-qrexec-agent"
services="$services qubes-random-seed"
for srv in $services; do for srv in $services; do
/bin/systemctl --no-reload preset $srv.service /bin/systemctl --no-reload preset $srv.service
done done

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

@ -70,5 +70,6 @@ enable qubes-netwatcher.service
enable qubes-meminfo-writer.service enable qubes-meminfo-writer.service
enable iptables.service enable iptables.service
enable ip6tables.service enable ip6tables.service
enable qubes-random-seed.service
enable haveged.service enable haveged.service
enable chronyd.service enable chronyd.service

4
vm-systemd/qubes-random-seed.service
View File

@ -1,10 +1,12 @@
[Unit] [Unit]
Description=Qubes Random Seed Description=Qubes Random Seed
DefaultDependencies=no DefaultDependencies=no
RequiresMountsFor=/proc/xen/
After=qubes-db.service After=qubes-db.service
[Service] [Service]
Type=oneshot Type=oneshot
RemainAfterExit=yes RemainAfterExit=yes
ExecStart=/usr/lib/qubes/init/qubes-random-seed.sh ExecStart=/usr/lib/qubes/init/qubes-random-seed.sh
[Install]
WantedBy=sysinit.target