From: Zoltán Böszörményi <zboszor@pr.hu>
Date: Mon, 8 Feb 2021 16:50:19 +0000 (+0100)
Subject: fix(network-manager): allow override network manager version
X-Git-Tag: 052~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=767fbf81b680c9dd24b5798bf9896b5811f2ceb2;p=thirdparty%2Fdracut.git

fix(network-manager): allow override network manager version

With dracutsysrootdir set and foreign binaries in sysroot,
running NetworkManager --version is not possible and it may be
different than the one installed on the host.
NM_VERSION can be used to override it.

Signed-off-by: Zoltán Böszörményi <zboszor@pr.hu>
---

diff --git a/dracut.8.asc b/dracut.8.asc
index 9110b4e0d..dcbfe5976 100644
--- a/dracut.8.asc
+++ b/dracut.8.asc
@@ -599,6 +599,9 @@ _SYSTEMD_VERSION_::
 _SYSTEMCTL_::
     overrides the systemctl binary. Used for **--sysroot**.
 
+_NM_VERSION_::
+    overrides the NetworkManager version. Used for **--sysroot**.
+
 _DRACUT_INSTALL_PATH_::
     overrides **PATH** environment for **dracut-install** to look for
     binaries relative to **--sysroot**. In a cross-compiled environment
diff --git a/modules.d/35network-manager/module-setup.sh b/modules.d/35network-manager/module-setup.sh
index ed2f399e2..92ea7b08f 100755
--- a/modules.d/35network-manager/module-setup.sh
+++ b/modules.d/35network-manager/module-setup.sh
@@ -24,7 +24,7 @@ installkernel() {
 install() {
     local _nm_version
 
-    _nm_version=$(NetworkManager --version)
+    _nm_version=${NM_VERSION:-$(NetworkManager --version)}
 
     # We don't need `ip` but having it is *really* useful for people debugging
     # in an emergency shell.