added support for either resolv.conf or resolvectl

lgandx · Jan 6, 2024 · 1a2f2fd · 1a2f2fd
1 parent e51f24e
commit 1a2f2fd
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/settings.py b/settings.py
@@ -335,10 +335,12 @@ def populate(self, options):
 				NetworkCard = "Error fetching Network Interfaces:", ex
 				pass
 		try:
-			DNS = subprocess.check_output(["resolvectl", "status"])
-		except subprocess.CalledProcessError as ex:
-			DNS = "Error fetching DNS configuration:", ex
-			pass
+			p = subprocess.Popen('resolvectl', stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+			DNS = p.stdout.read()
+		except:
+			p = subprocess.Popen(['cat', '/etc/resolv.conf'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+			DNS = p.stdout.read()
+
 		try:
 			RoutingInfo = subprocess.check_output(["netstat", "-rn"])
 		except: