]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
systemd: fix wrong path of tmp.mount
authorChangqing Li <changqing.li@windriver.com>
Thu, 30 May 2024 09:02:34 +0000 (17:02 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 13 Jun 2024 08:10:09 +0000 (09:10 +0100)
According to meson.build, tmp.mount is installed under
"prefixdir/'lib/systemd/system'", but for 64bit system, rootlibdir is
/usr/lib64/systemd/system, this make tmp.mount not removed, and /tmp
still mounted as tmpfs filesystem. Fixed by using rootlibexecdir, which
is /usr/lib/systemd/system.

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/systemd/systemd_255.6.bb

index 62842d43c88a850cd45801e3427fae58c5c99b90..15b631fc07c052cc6809a270d5d9d10ae813ac31 100644 (file)
@@ -320,8 +320,8 @@ do_install() {
        # if the user requests /tmp be on persistent storage (i.e. not volatile)
        # then don't use a tmpfs for /tmp
        if [ "${VOLATILE_TMP_DIR}" != "yes" ]; then
-               rm -f ${D}${rootlibdir}/systemd/system/tmp.mount
-               rm -f ${D}${rootlibdir}/systemd/system/local-fs.target.wants/tmp.mount
+               rm -f ${D}${rootlibexecdir}/systemd/system/tmp.mount
+               rm -f ${D}${rootlibexecdir}/systemd/system/local-fs.target.wants/tmp.mount
        fi
 
        install -d ${D}${systemd_system_unitdir}/graphical.target.wants