Merge branch 't2564-lcd' of github.com:c-po/vyos-1x into current

* 't2564-lcd' of github.com:c-po/vyos-1x:
  lcd: T2564: flatten CLI interface
  system display: T2564: Added test model
  system display: T2564: Dictionary code update
  system display: T2564: Conf files to /run
  system display: T2564: Changed "duration" to "time"
  system display: T2564: py code cleanup
  system display: T2564: Replace "config (enabled|disabled)" with "display disabled"
  system display: T2564: Lowercase model names
  system display: T2564 Extend VyOS to support appliance LCDs

1 files changed, 1 insertions, 11 deletions

diff --git a/src/conf_mode/interfaces-wirelessmodem.py b/src/conf_mode/interfaces-wirelessmodem.py
index 4081be3c9..6d168d918 100755
--- a/src/conf_mode/interfaces-wirelessmodem.py
+++ b/src/conf_mode/interfaces-wirelessmodem.py
@@ -16,7 +16,6 @@
 
 import os
 
-from fnmatch import fnmatch
 from sys import exit
 
 from vyos.config import Config
@@ -25,22 +24,13 @@ from vyos.configverify import verify_vrf
 from vyos.template import render
 from vyos.util import call
 from vyos.util import check_kmod
+from vyos.util import find_device_file
 from vyos import ConfigError
 from vyos import airbag
 airbag.enable()
 
 k_mod = ['option', 'usb_wwan', 'usbserial']
 
-def find_device_file(device):
-    """ Recurively search /dev for the given device file and return its full path.
-        If no device file was found 'None' is returned """
-    for root, dirs, files in os.walk('/dev'):
-        for basename in files:
-            if fnmatch(basename, device):
-                return os.path.join(root, basename)
-
-    return None
-
 def get_config():
     """
     Retrive CLI config as dictionary. Dictionary can never be empty, as at least the