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

* 'udev' of github.com:c-po/vyos-1x:
  usb: op-mode: T2560: display USB interface information
  pppoe: op-mode: T2488: retrieve log info from journalctl
  wwan: op-mode: T2488: retrieve log info from journalctl
  wwan: T2241: interface is not bond- or bridgeable
  wwan: T2488: remove generation of dedicated logfile
  wwan: T2529: migrate device from ttyUSB to usbXbY.YpZ.Z
  udev: T2490: add persistent USB device files

3 files changed, 28 insertions, 11 deletions

diff --git a/op-mode-definitions/show-interfaces-pppoe.xml b/op-mode-definitions/show-interfaces-pppoe.xml
index 65363f7e2..01acd4fc6 100644
--- a/op-mode-definitions/show-interfaces-pppoe.xml
+++ b/op-mode-definitions/show-interfaces-pppoe.xml
@@ -13,9 +13,15 @@
             </properties>
             <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4"</command>
             <children>
+              <leafNode name="log">
+                <properties>
+                  <help>Show specified PPPoE interface log</help>
+                </properties>
+                <command>/usr/bin/journalctl -u "ppp@$4".service</command>
+              </leafNode>
               <leafNode name="statistics">
                 <properties>
-                  <help>Show PPPoE interface statistics</help>
+                  <help>Show specified PPPoE interface statistics</help>
                   <completionHelp>
                     <path>interfaces pppoe</path>
                   </completionHelp>
diff --git a/op-mode-definitions/show-interfaces-wirelessmodem.xml b/op-mode-definitions/show-interfaces-wirelessmodem.xml
index b21bb520c..1f710b3dc 100644
--- a/op-mode-definitions/show-interfaces-wirelessmodem.xml
+++ b/op-mode-definitions/show-interfaces-wirelessmodem.xml
@@ -13,9 +13,15 @@
             </properties>
             <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4"</command>
             <children>
+              <leafNode name="log">
+                <properties>
+                  <help>Show specified WWAN interface log</help>
+                </properties>
+                <command>/usr/bin/journalctl -u "ppp@$4".service</command>
+              </leafNode>
               <leafNode name="statistics">
                 <properties>
-                  <help>Show specified wirelessmodem interface statistics</help>
+                  <help>Show specified WWAN interface statistics</help>
                   <completionHelp>
                     <path>interfaces wirelessmodem</path>
                   </completionHelp>
diff --git a/op-mode-definitions/show-system-info.xml b/op-mode-definitions/show-system.xml
index 61c947bbe..b7f56ae20 100644
--- a/op-mode-definitions/show-system-info.xml
+++ b/op-mode-definitions/show-system.xml
@@ -7,7 +7,6 @@
           <help>Show system information</help>
         </properties>
         <children>
-
           <node name="connections">
             <properties>
               <help>Show active network connections on the system</help>
@@ -50,21 +49,18 @@
               </node>
             </children>
           </node>
-
           <leafNode name= "integrity">
             <properties>
               <help>Checks overall system integrity</help>
             </properties>
             <command>sudo ${vyos_op_scripts_dir}/system_integrity.py</command>
           </leafNode>
-
           <leafNode name="kernel-messages">
             <properties>
               <help>Show messages in kernel ring buffer</help>
             </properties>
             <command>sudo dmesg</command>
           </leafNode>
-
           <node name="login">
             <properties>
               <help>Show user accounts</help>
@@ -104,7 +100,6 @@
               </node>
             </children>
           </node>
-
           <node name="memory">
             <properties>
               <help>Show system memory usage</help>
@@ -125,7 +120,6 @@
               </leafNode>
             </children>
           </node>
-
           <node name="processes">
             <properties>
               <help>Show system processes</help>
@@ -152,21 +146,32 @@
               </leafNode>
             </children>
           </node>
-
           <leafNode name="storage">
             <properties>
               <help>Show filesystem usage</help>
             </properties>
             <command>df -h -x squashfs</command>
           </leafNode>
-
           <leafNode name="uptime">
             <properties>
               <help>Show how long the system has been up</help>
             </properties>
             <command>uptime</command>
           </leafNode>
-
+          <node name="usb">
+            <properties>
+              <help>Show information about Universal Serial Bus (USB)</help>
+            </properties>
+            <command>/usr/bin/lsusb -t</command>
+            <children>
+              <leafNode name="serial">
+                <properties>
+                  <help>Show information about connected USB serial ports</help>
+                </properties>
+                <command>${vyos_op_scripts_dir}/show_usb_serial.py</command>
+              </leafNode>
+            </children>
+          </node>
         </children>
       </node>
     </children>