Use tmpfile.d to create /var/run subdirs

This way it will be done much earlier, so qubes-db can be started before
qubes-core.service - which will solve startup dependency loop problem.
This commit is contained in:
Marek Marczykowski-Górecki 2015-02-02 04:48:42 +01:00
parent db95153619
commit c74fda802c
4 changed files with 5 additions and 7 deletions

View File

@ -13,13 +13,6 @@ chgrp qubes /proc/xen/xenbus
chmod 660 /proc/xen/xenbus
chgrp qubes /dev/xen/evtchn
chmod 660 /dev/xen/evtchn
mkdir -p /var/run/qubes
chgrp qubes /var/run/qubes
chmod 770 /var/run/qubes
touch /var/run/qubes/xl-lock
chgrp qubes /var/run/qubes/xl-lock
chmod 660 /var/run/qubes/xl-lock
chgrp -R qubes /var/log/xen
chmod -R g+rX /var/log/xen
chmod g+s /var/log/xen/console
mkdir -p /var/run/xen-hotplug

View File

@ -8,3 +8,4 @@ install:
ln -s block-snapshot $(DESTDIR)/etc/xen/scripts/block-origin
install -d $(DESTDIR)/etc/xdg/autostart
install -m 0644 qubes-guid.desktop $(DESTDIR)/etc/xdg/autostart/
install -m 0644 -D tmpfiles-qubes.conf $(DESTDIR)/usr/lib/tmpfiles.d/qubes.conf

View File

@ -0,0 +1,3 @@
d /var/run/qubes 0770 root qubes
f /var/run/qubes/xl-lock 0660 root qubes
d /var/run/xen-hotplug 0755 root root

View File

@ -234,6 +234,7 @@ fi
%attr(2770,root,qubes) %dir /var/lib/qubes/vm-kernels
/usr/share/qubes/vm-template.xml
/usr/share/qubes/vm-template-hvm.xml
/usr/lib/tmpfiles.d/qubes.conf
/usr/lib/qubes/qubes-prepare-saved-domain.sh
/usr/lib/qubes/qubes-update-dispvm-savefile-with-progress.sh
/etc/xen/scripts/block.qubes