New upstream version 1.54.0 upstream/1.54.0

4 files changed, 3 insertions, 29 deletions

diff --git a/tools/generate-docs-nm-settings-docs-gir.py b/tools/generate-docs-nm-settings-docs-gir.py
index e438d87a..40fab200 100755
--- a/tools/generate-docs-nm-settings-docs-gir.py
+++ b/tools/generate-docs-nm-settings-docs-gir.py
@@ -6,26 +6,9 @@
 from __future__ import print_function, unicode_literals
 import xml.etree.ElementTree as ET
 import argparse
-import os
 import gi
 import re
 
-gi.require_version("GIRepository", "2.0")
-from gi.repository import GIRepository
-
-try:
-    libs = os.environ["LD_LIBRARY_PATH"].split(":")
-    libs.reverse()
-    for lib in libs:
-        GIRepository.Repository.prepend_library_path(lib)
-except AttributeError:
-    # An old GI version, that has no prepend_library_path
-    # It's alright, it probably interprets LD_LIBRARY_PATH
-    # correctly.
-    pass
-except KeyError:
-    pass
-
 gi.require_version("NM", "1.0")
 from gi.repository import NM, GObject
 
@@ -355,13 +338,6 @@ def main(gir_path_str, output_path_str, output_target):
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
     parser.add_argument(
-        "-l",
-        "--lib-path",
-        metavar="PATH",
-        action="append",
-        help="path to scan for shared libraries",
-    )
-    parser.add_argument(
         "-g",
         "--gir",
         metavar="FILE",
@@ -384,8 +360,4 @@ if __name__ == "__main__":
 
     args = parser.parse_args()
 
-    if args.lib_path:
-        for lib in args.lib_path:
-            GIRepository.Repository.prepend_library_path(lib)
-
     main(args.gir, args.output, args.target)
diff --git a/tools/nm-in-container b/tools/nm-in-container
index 0e3f31da..365b8fcf 100755
--- a/tools/nm-in-container
+++ b/tools/nm-in-container
@@ -224,6 +224,7 @@ RUN dnf install -y \\
     libasan \\
     libcurl-devel \\
     libndp-devel \\
+    libnvme-devel \\
     libpsl-devel \\
     libselinux-devel \\
     libtool \\
diff --git a/tools/nm-in-vm b/tools/nm-in-vm
index 4d2c7a15..cf42b038 100755
--- a/tools/nm-in-vm
+++ b/tools/nm-in-vm
@@ -17,7 +17,7 @@ set -e
 #
 # Options (they MUST go before the command):
 #  -v | --vm: name of the VM to run the command on (by default 'nm').
-#             This allows to have more than one VM at the same time
+#             This allows one to have more than one VM at the same time
 #  -h | --help: show this text
 #
 # NetworkManager directories:
diff --git a/tools/test-networkmanager-service.py b/tools/test-networkmanager-service.py
index 8d39aef7..0a13f2bd 100755
--- a/tools/test-networkmanager-service.py
+++ b/tools/test-networkmanager-service.py
@@ -613,6 +613,7 @@ class NmUtil:
         if t not in [
             NM.SETTING_GSM_SETTING_NAME,
             NM.SETTING_MACVLAN_SETTING_NAME,
+            NM.SETTING_OVS_INTERFACE_SETTING_NAME,
             NM.SETTING_VLAN_SETTING_NAME,
             NM.SETTING_VPN_SETTING_NAME,
             NM.SETTING_WIMAX_SETTING_NAME,