Merge pull request #4268 from natali-rs1985/T6956

op_mode: T6956: Fix for "generate tech-support archive" if /config contains directories

1 files changed, 10 insertions, 9 deletions

diff --git a/src/op_mode/tech_support.py b/src/op_mode/tech_support.py
index f60bb87ff..24ac0af1b 100644
--- a/src/op_mode/tech_support.py
+++ b/src/op_mode/tech_support.py
@@ -97,21 +97,22 @@ def _get_boot_config():
     return strip_config_source(config)
 
 def _get_config_scripts():
-    from os import listdir
+    from os import walk
     from os.path import join
     from vyos.utils.file import read_file
 
     scripts = []
 
     dir = '/config/scripts'
-    for f in listdir(dir):
-        script = {}
-        path = join(dir, f)
-        data = read_file(path)
-        script["path"] = path
-        script["data"] = data
-
-        scripts.append(script)
+    for dirpath, _, filenames in walk(dir):
+        for filename in filenames:
+            script = {}
+            path = join(dirpath, filename)
+            data = read_file(path)
+            script["path"] = path
+            script["data"] = data
+
+            scripts.append(script)
 
     return scripts