diff options
author | Stefan Agner <stefan.agner@toradex.com> | 2019-07-19 21:48:44 +0200 |
---|---|---|
committer | Patrick Vacek <patrickvacek@gmail.com> | 2019-07-24 13:37:11 +0200 |
commit | 14c7d1485720c16d1905ed8861cb43d8e75245f9 (patch) | |
tree | 1a9471e7b29f57c2bf0afffc85b33f119c6709b9 | |
parent | 7530d93ebb97b519a12b88d121320ac0bb711c46 (diff) | |
download | meta-updater-14c7d1485720c16d1905ed8861cb43d8e75245f9.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>
-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 5b975f0..91fe910 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
@@ -80,15 +80,15 @@ IMAGE_CMD_ostree () { | |||
80 | if [ "$(ls -A $dir)" ]; then | 80 | if [ "$(ls -A $dir)" ]; then |
81 | bbwarn "Data in /$dir directory is not preserved by OSTree. Consider moving it under /usr" | 81 | bbwarn "Data in /$dir directory is not preserved by OSTree. Consider moving it under /usr" |
82 | fi | 82 | fi |
83 | |||
84 | if [ -n "${SYSTEMD_USED}" ]; then | ||
85 | echo "d /var/rootdirs/${dir} 0755 root root -" >>${tmpfiles_conf} | ||
86 | else | ||
87 | echo "mkdir -p /var/rootdirs/${dir}; chown 755 /var/rootdirs/${dir}" >>${tmpfiles_conf} | ||
88 | fi | ||
89 | rm -rf ${dir} | 83 | rm -rf ${dir} |
90 | ln -sf var/rootdirs/${dir} ${dir} | ||
91 | fi | 84 | fi |
85 | |||
86 | if [ -n "${SYSTEMD_USED}" ]; then | ||
87 | echo "d /var/rootdirs/${dir} 0755 root root -" >>${tmpfiles_conf} | ||
88 | else | ||
89 | echo "mkdir -p /var/rootdirs/${dir}; chown 755 /var/rootdirs/${dir}" >>${tmpfiles_conf} | ||
90 | fi | ||
91 | ln -sf var/rootdirs/${dir} ${dir} | ||
92 | done | 92 | done |
93 | 93 | ||
94 | if [ -d root ] && [ ! -L root ]; then | 94 | if [ -d root ] && [ ! -L root ]; then |