diff options
author | Stefan Agner <stefan.agner@toradex.com> | 2019-07-19 21:48:44 +0200 |
---|---|---|
committer | Laurent Bonnans <laurent.bonnans@here.com> | 2019-08-15 17:48:39 +0200 |
commit | 0b592956d0ac9784a7435d94ed9c06aaecc03ed3 (patch) | |
tree | 8f8b4c3c8fe9dec1b8d6220c29f0c383d3f36564 | |
parent | 7c7aec62e844e79e862cb9ac49ca9f73c5931629 (diff) | |
download | meta-updater-0b592956d0ac9784a7435d94ed9c06aaecc03ed3.tar.gz |
image_types_ostree: add top level directories unconditionally
The Filesystem Hierarchy Standard defines several top-level directory
to be writeable. Add those even in the absence of files installed by
OpenEmbedded so a user might actually use them.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
(cherry-picked from commit 986526193a8f2f08ccdc77d71bb7d7f5e86185f0)
-rw-r--r-- | classes/image_types_ostree.bbclass | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index ca97fdb..b7104d7 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
@@ -93,15 +93,15 @@ IMAGE_CMD_ostree () { | |||
93 | if [ "$(ls -A $dir)" ]; then | 93 | if [ "$(ls -A $dir)" ]; then |
94 | bbwarn "Data in /$dir directory is not preserved by OSTree. Consider moving it under /usr" | 94 | bbwarn "Data in /$dir directory is not preserved by OSTree. Consider moving it under /usr" |
95 | fi | 95 | fi |
96 | |||
97 | if [ -n "${SYSTEMD_USED}" ]; then | ||
98 | echo "d /var/rootdirs/${dir} 0755 root root -" >>${tmpfiles_conf} | ||
99 | else | ||
100 | echo "mkdir -p /var/rootdirs/${dir}; chown 755 /var/rootdirs/${dir}" >>${tmpfiles_conf} | ||
101 | fi | ||
102 | rm -rf ${dir} | 96 | rm -rf ${dir} |
103 | ln -sf var/rootdirs/${dir} ${dir} | ||
104 | fi | 97 | fi |
98 | |||
99 | if [ -n "${SYSTEMD_USED}" ]; then | ||
100 | echo "d /var/rootdirs/${dir} 0755 root root -" >>${tmpfiles_conf} | ||
101 | else | ||
102 | echo "mkdir -p /var/rootdirs/${dir}; chown 755 /var/rootdirs/${dir}" >>${tmpfiles_conf} | ||
103 | fi | ||
104 | ln -sf var/rootdirs/${dir} ${dir} | ||
105 | done | 105 | done |
106 | 106 | ||
107 | if [ -d root ] && [ ! -L root ]; then | 107 | if [ -d root ] && [ ! -L root ]; then |