Merge pull request #132 from mobiwize/morty

Fix cronie and OSTree conflicts

1 files changed, 6 insertions, 0 deletions

diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index 8c9f262..29f267d 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -82,6 +82,12 @@ IMAGE_CMD_ostree () {
                 ln -sf var/rootdirs/home home
         fi
 
+    # Move cron jobs if exist
+    if [ -d "var/spool/cron" ] && [ "$(ls -A var/spool/cron)" ] &&
+        [ -d "usr/share/cronie-spool" ] ; then
+        mv var/spool/cron/* usr/share/cronie-spool/
+    fi
+
         # Move persistent directories to /var
         dirs="opt mnt media srv"