Merge pull request #165 from endlessm/T35498-kolibri-data-chown

image: Chown Kolibri and Endless Key data

config/defaults.ini

@@ -131,6 +131,7 @@ hooks_add =
   62-kolibri-automatic-provision
   62-kolibri-options
   63-icon-grid
+  63-kolibri-chown.chroot
   70-flatpak-appstream-catalog
   70-flatpak-manifest
   70-ostree-manifest

hooks/image/53-ek-content-preload

@@ -83,3 +83,9 @@ fi
 # unique Facility ID.
 # <https://kolibri.readthedocs.io/en/latest/install/provision.html#prepare-the-kolibri-folder-for-copying>
 (echo yes; echo yes) | kolibri manage --skip-update deprovision
+
+# Chown all the files to the kolibri user. This also happens at runtime
+# via the endless-key.conf tmpfiles.d configuration.
+kolibri_uid=$(ostree_uid kolibri)
+kolibri_gid=$(ostree_gid kolibri)
+chown -R "${kolibri_uid}:${kolibri_gid}" "${OSTREE_VAR}"/lib/endless-key

hooks/image/63-kolibri-chown.chroot

@@ -0,0 +1,5 @@
+# Chown all Kolibri data files to the kolibri user. This also happens at
+# runtime via the eos-kolibri.conf tmpfiles.d configuration.
+if [ -d /var/lib/kolibri ]; then
+  chown -R kolibri:kolibri /var/lib/kolibri
+fi