diff options
| author |   Stefan Agner <stefan.agner@toradex.com> | 2019-11-27 15:41:16 +0100 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2020-01-05 14:43:51 -0800 |
| commit | 6ecbdf2131e756a5460bca821277eee019aa3f32 (patch) | |
| tree | d5ce1a966cd2e409833c9552914f93cc6804bc61 | |
| parent | 5320ae9f023a3a3866a8cddc4a175d9be2f5e27b (diff) | |
| download | meta-openembedded-contrib-6ecbdf2131e756a5460bca821277eee019aa3f32.tar.gz | |
networkmanager: do not deploy unnecessary udev rule file
The 84-nm-drivers.rules is not required for systemd-udevd versions
v210 and later. The file has been split into a separate file so
distributions with a new enough systemd version can drop it. See
also:
https://github.com/NetworkManager/NetworkManager/commit/1e0375826252abf9aab2aef273a2a24cd08c9f42
I noticed this while investigating into a warning show during
bootup:
/usr/lib/udev/rules.d/84-nm-drivers.rules:10 Invalid value "/bin/sh -c
'ethtool -i $1 | sed -n s/^driver:\ //p' -- $env{INTERFACE}" for PROGRAM
(char 24: invalid substitution type), ignoring, but please fix it.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 82ecc0e69fe3920360d1ba8bd1b5e6ede164de42)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb index 085807c4ce..27508c4d93 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb @@ -141,8 +141,11 @@ do_install_append() { rm -rf ${D}/run ${D}${localstatedir}/run - # For read-only filesystem, do not create links during bootup if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + # For read-only filesystem, do not create links during bootup ln -sf ../run/NetworkManager/resolv.conf ${D}${sysconfdir}/resolv-conf.NetworkManager + + # systemd v210 and newer do not need this rule file + rm ${D}/${nonarch_base_libdir}/udev/rules.d/84-nm-drivers.rules fi } |