diff --git a/meta-oniro-core/recipes-core/oniro-mounts/oniro-mounts.bb b/meta-oniro-core/recipes-core/oniro-mounts/oniro-mounts.bb index ee74a66669a521310dc98080e0dd70e4f5dfd9d1..ccd0d8bb358a88a0cac0f643e2f91c0b51704050 100644 --- a/meta-oniro-core/recipes-core/oniro-mounts/oniro-mounts.bb +++ b/meta-oniro-core/recipes-core/oniro-mounts/oniro-mounts.bb @@ -12,15 +12,18 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" SRC_URI = " \ + file://home.mount \ file://run-mount-boot.mount \ file://run-mount-devdata.mount \ file://run-mount-appdata.mount \ file://run-mount-sysdata.mount \ + file://oniro-homes.conf.tmpfiles \ " inherit allarch systemd SYSTEMD_SERVICE:${PN} = " \ + home.mount \ run-mount-boot.mount \ run-mount-sysdata.mount \ run-mount-devdata.mount \ @@ -40,6 +43,10 @@ do_install () { for label in ${LABELS}; do install -m 0644 "${WORKDIR}/run-mount-${label}.mount" "${D}${systemd_unitdir}/system" done + install -m 0644 "${WORKDIR}/home.mount" "${D}${systemd_unitdir}/system" + + install -D "${WORKDIR}/oniro-homes.conf.tmpfiles" \ + "${D}${sysconfdir}/tmpfiles.d/oniro-homes.conf" } FILES:${PN} += "${systemd_unitdir}" diff --git a/meta-oniro-core/recipes-core/oniro-mounts/oniro-mounts/home.mount b/meta-oniro-core/recipes-core/oniro-mounts/oniro-mounts/home.mount new file mode 100644 index 0000000000000000000000000000000000000000..83b282d2006cd4634b319e402bd81a02d09b9332 --- /dev/null +++ b/meta-oniro-core/recipes-core/oniro-mounts/oniro-mounts/home.mount @@ -0,0 +1,17 @@ +# SPDX-FileCopyrightText: Huawei Inc. +# +# SPDX-License-Identifier: Apache-2.0 + +[Unit] +Description=home mount - appdata +Before=sysinit.target +Requires=run-mount-appdata.mount +After=run-mount-appdata.mount + +[Mount] +What=/run/mount/appdata/user-data/home +Where=/home +Options=bind + +[Install] +WantedBy=sysinit.target diff --git a/meta-oniro-core/recipes-core/oniro-mounts/oniro-mounts/oniro-homes.conf.tmpfiles b/meta-oniro-core/recipes-core/oniro-mounts/oniro-mounts/oniro-homes.conf.tmpfiles new file mode 100644 index 0000000000000000000000000000000000000000..8cce21e961bdd1f12b6ce3ded801d1dff94a0cab --- /dev/null +++ b/meta-oniro-core/recipes-core/oniro-mounts/oniro-mounts/oniro-homes.conf.tmpfiles @@ -0,0 +1,6 @@ +# SPDX-FileCopyrightText: Huawei Inc. +# +# SPDX-License-Identifier: Apache-2.0 + +# The home directory of the oniro user. +d /run/mount/appdata/user-data/home/oniro 0700 oniro oniro - -