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

* qubesos/pr/35:
  Constrain cron and anacron in Ubuntu also
  Stop anacron from starting in Debian using existing constraint on cron

Makefile

@@ -63,6 +63,15 @@ SYSTEM_DROPINS += tor.service tor@default.service
 
 USER_DROPINS := pulseaudio.service pulseaudio.socket
 
+# Ubuntu Dropins
+ifeq ($(shell lsb_release -is), Ubuntu)
+
+    # 'crond.service' is named 'cron.service in Debian
+    SYSTEM_DROPINS := $(strip $(patsubst crond.service, cron.service, $(SYSTEM_DROPINS)))
+    SYSTEM_DROPINS += anacron.service
+    SYSTEM_DROPINS += anacron-resume.service
+endif
+
 # Debian Dropins
 ifeq ($(shell lsb_release -is), Debian)
     # Don't have 'ntpd' in Debian
@@ -77,6 +86,9 @@ ifeq ($(shell lsb_release -is), Debian)
 
     # handled by qubes-iptables service now
     SYSTEM_DROPINS += netfilter-persistent.service
+
+    SYSTEM_DROPINS += anacron.service
+    SYSTEM_DROPINS += anacron-resume.service
 endif
 
 install-systemd-dropins:

patches.debian/01_add_anacron.patch

@@ -0,0 +1,8 @@
+Index: core-agent-linux/misc/30_cron.conf
+===================================================================
+--- core-agent-linux.orig/misc/30_cron.conf    2017-01-06 22:47:57.855061937 +0000
++++ core-agent-linux/misc/30_cron.conf 2017-01-07 01:31:16.382061937 +0000
+@@ -1 +1,2 @@
+ binds+=( '/var/spool/cron' )
++binds+=( '/var/spool/anacron' )
+

series-debian-vm.conf

@@ -1 +1 @@
-patches.debian/qrexec_disable_all_warnings_as_errors.patch
+patches.debian/01_add_anacron.patch

vm-systemd/anacron-resume.service.d/30_qubes.conf

@@ -0,0 +1,3 @@
+[Unit]
+ConditionPathExists=/var/run/qubes-service/crond
+

vm-systemd/anacron.service.d/30_qubes.conf

@@ -0,0 +1,3 @@
+[Unit]
+ConditionPathExists=/var/run/qubes-service/crond
+