mirror of
https://git.yoctoproject.org/poky
synced 2026-04-21 03:32:12 +02:00
udev-extraconf: force systemd-udevd to use shared MountFlags
Automounting does not work cleanly in case systemd as well as udev rules are being used simultaneously and in most cases race conditions and unknown behavior can come up. In case we're running on top of systemd we need to make sure that systemd-udevd knows that udev is in play as well and mounting should be done using shared flags. Also as we're using mount from sources other than systemd-mount in current scripts this is the most manageable fix to automounting problems. (From OE-Core rev: 00ea4314feb51d82f9027bf53ff627541180daca) Signed-off-by: Awais Belal <awais_belal@mentor.com> Signed-off-by: Muhammad Hamza <muhammad_hamza@mentor.com> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> (cherry picked from commit 1e770416b4c9a0468404fb64d55114d93e84763b) Signed-off-by: Ming Liu <liu.ming50@gmail.com> Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
8eafba72be
commit
c993a88c3f
@@ -0,0 +1,3 @@
|
||||
.include @systemd_unitdir@/system/systemd-udevd.service
|
||||
[Service]
|
||||
MountFlags=shared
|
||||
@@ -11,6 +11,7 @@ SRC_URI = " \
|
||||
file://autonet.rules \
|
||||
file://network.sh \
|
||||
file://localextra.rules \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'file://systemd-udevd.service', '', d)} \
|
||||
"
|
||||
|
||||
S = "${WORKDIR}"
|
||||
@@ -35,9 +36,15 @@ do_install() {
|
||||
sed -i 's|@MOUNT_BASE@|${MOUNT_BASE}|g' ${D}${sysconfdir}/udev/scripts/mount.sh
|
||||
|
||||
install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts
|
||||
|
||||
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
|
||||
install -d ${D}${sysconfdir}/systemd/system
|
||||
install ${WORKDIR}/systemd-udevd.service ${D}${sysconfdir}/systemd/system/systemd-udevd.service
|
||||
sed -i 's|@systemd_unitdir@|${systemd_unitdir}|g' ${D}${sysconfdir}/systemd/system/systemd-udevd.service
|
||||
fi
|
||||
}
|
||||
|
||||
FILES:${PN} = "${sysconfdir}/udev"
|
||||
FILES:${PN} = "${sysconfdir}/udev ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${sysconfdir}/systemd/system/systemd-udevd.service', '', d)}"
|
||||
RDEPENDS:${PN} = "udev util-linux-blkid"
|
||||
CONFFILES:${PN} = "${sysconfdir}/udev/mount.ignorelist"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user