diff --git a/Makefile b/Makefile index 8281dca..82e1e0b 100644 --- a/Makefile +++ b/Makefile @@ -260,6 +260,10 @@ endif install -D -m 0644 misc/xorg-preload-apps.conf $(DESTDIR)/etc/X11/xorg-preload-apps.conf + install -d $(DESTDIR)/usr/lib/qubes-bind-dirs.d + install -D -m 0644 misc/30_cron.conf $(DESTDIR)/usr/lib/qubes-bind-dirs.d/30_cron.conf + + install -d $(DESTDIR)/var/run/qubes install -d $(DESTDIR)/home_volatile/user install -d $(DESTDIR)/rw diff --git a/debian/changelog b/debian/changelog index b4e8d76..5ad2db8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +qubes-core-agent (3.2.12-1) wheezy; urgency=medium + + [ Unman ] + * cron: set up bind-dirs for /var/spool/cron + + -- unman Sat, 16 Oct 2016 21:53:40 +0000 + qubes-core-agent (3.2.11-1) wheezy; urgency=medium [ HW42 ] diff --git a/misc/30_cron.conf b/misc/30_cron.conf new file mode 100644 index 0000000..5eab990 --- /dev/null +++ b/misc/30_cron.conf @@ -0,0 +1 @@ +binds+=( '/var/spool/cron' ) diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec index 8c3bd39..c20f300 100644 --- a/rpm_spec/core-vm.spec +++ b/rpm_spec/core-vm.spec @@ -425,6 +425,8 @@ rm -f %{name}-%{version} /usr/lib/yum-plugins/yum-qubes-hooks.py* /usr/lib/dracut/dracut.conf.d/30-qubes.conf /usr/lib/NetworkManager/conf.d/30-qubes.conf +%dir /usr/lib/qubes-bind-dirs.d +/usr/lib/qubes-bind-dirs.d/30_cron.conf /usr/lib64/python2.7/site-packages/qubes/xdg.py* /usr/sbin/qubes-firewall /usr/sbin/qubes-netwatcher diff --git a/version b/version index 17ce918..275e51e 100644 --- a/version +++ b/version @@ -1 +1 @@ -3.2.11 +3.2.12 diff --git a/vm-systemd/cron.service.d/30_qubes.conf b/vm-systemd/cron.service.d/30_qubes.conf index 980ba5c..0b4ad9a 100644 --- a/vm-systemd/cron.service.d/30_qubes.conf +++ b/vm-systemd/cron.service.d/30_qubes.conf @@ -1,3 +1,5 @@ [Unit] ConditionPathExists=/var/run/qubes-service/crond + +[Service] After=qubes-sysinit.service diff --git a/vm-systemd/crond.service.d/30_qubes.conf b/vm-systemd/crond.service.d/30_qubes.conf index 980ba5c..0b4ad9a 100644 --- a/vm-systemd/crond.service.d/30_qubes.conf +++ b/vm-systemd/crond.service.d/30_qubes.conf @@ -1,3 +1,5 @@ [Unit] ConditionPathExists=/var/run/qubes-service/crond + +[Service] After=qubes-sysinit.service