Network: drop unsupported technologies

yast · Nov 18, 2019 · 39d08fb · 39d08fb
1 parent 43753ef
commit 39d08fb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 34 deletions.
diff --git a/library/network/src/modules/NetworkInterfaces.rb b/library/network/src/modules/NetworkInterfaces.rb
@@ -100,7 +100,7 @@ def main
       @CardRegex =
         # other: irlan|lo|plip|...
         {
-          "netcard" => "ath|bnep|ci|ctc|slc|dummy|bond|escon|eth|fddi|ficon|hsi|qeth|lcs|iucv|myri|tr|usb|wlan|xp|vlan|br|tun|tap|ib|em|p|p[0-9]+p",
+          "netcard" => "ath|ci|ctc|slc|dummy|bond|eth|ficon|hsi|qeth|lcs|iucv|wlan|xp|vlan|br|tun|tap|ib|em|p|p[0-9]+p",
           "modem"   => "ppp|modem",
           "isdn"    => "isdn|ippp",
           "dsl"     => "dsl"
@@ -1013,17 +1013,14 @@ def Import(devregex, devices)
     # for this hardware
     def GetDeviceTypes
       # common linux device types available on all architectures
-      common_dev_types = ["eth", "tr", "vlan", "br", "tun", "tap", "bond"]
+      common_dev_types = ["eth", "vlan", "br", "tun", "tap", "bond"]
 
       # s390 specific device types
-      s390_dev_types = ["hsi", "ctc", "escon", "ficon", "iucv", "qeth", "lcs"]
+      s390_dev_types = ["hsi", "ctc", "ficon", "iucv", "qeth", "lcs"]
 
       # device types which cannot be present on s390 arch
       s390_unknown_dev_types = [
-        "bnep",
         "dummy",
-        "fddi",
-        "myri",
         "usb",
         "wlan",
         "ib"
@@ -1066,28 +1063,19 @@ def GetDevTypeDescription(type, longdescr)
       end
 
       device_types = {
-        # Device type label
-        "arc"   => [_("ARCnet"), _("ARCnet Network Card")],
         # Device type label
         "atm"   => [
           _("ATM"),
           _("Asynchronous Transfer Mode (ATM)")
         ],
         # Device type label
-        "bnep"  => [
-          _("Bluetooth"),
-          _("Bluetooth Connection")
-        ],
-        # Device type label
         "bond"  => [_("Bond"), _("Bond Network")],
         # Device type label
         "ci"    => [
           _("CLAW"),
           _("Common Link Access for Workstation (CLAW)")
         ],
         # Device type label
-        "contr" => [_("ISDN"), _("ISDN Card")],
-        # Device type label
         "ctc"   => [
           _("CTC"),
           _("Channel to Channel Interface (CTC)")
@@ -1097,18 +1085,11 @@ def GetDevTypeDescription(type, longdescr)
         # Device type label
         "dummy" => [_("Dummy"), _("Dummy Network Device")],
         # Device type label
-        "escon" => [
-          _("ESCON"),
-          _("Enterprise System Connector (ESCON)")
-        ],
-        # Device type label
         "eth"   => [
           _("Ethernet"),
           _("Ethernet Network Card")
         ],
         # Device type label
-        "fddi"  => [_("FDDI"), _("FDDI Network Card")],
-        # Device type label
         "ficon" => [
           _("FICON"),
           _("Fiberchannel System Connector (FICON)")
@@ -1143,8 +1124,6 @@ def GetDevTypeDescription(type, longdescr)
         # Device type label
         "modem" => [_("Modem"), _("Modem")],
         # Device type label
-        "myri"  => [_("Myrinet"), _("Myrinet Network Card")],
-        # Device type label
         "net"   => [_("ISDN"), _("ISDN Connection")],
         # Device type label
         "plip"  => [
@@ -1169,22 +1148,13 @@ def GetDevTypeDescription(type, longdescr)
           _("Serial Line Connection")
         ],
         # Device type label
-        "tr"    => [
-          _("Token Ring"),
-          _("Token Ring Network Card")
-        ],
-        # Device type label
-        "usb"   => [_("USB"), _("USB Network Device")],
-        # Device type label
         "vmnet" => [_("VMWare"), _("VMWare Network Device")],
         # Device type label
         "wlan"  => [
           _("Wireless"),
           _("Wireless Network Card")
         ],
         # Device type label
-        "xp"    => [_("XPNET"), _("XP Network")],
-        # Device type label
         "vlan"  => [_("VLAN"), _("Virtual LAN")],
         # Device type label
         "br"    => [_("Bridge"), _("Network Bridge")],

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Nov 17 23:21:31 UTC 2019 - Knut Anderssen <kanderssen@suse.com>
+
+- Network: dropped support for 'bne', 'escon', 'fddi', 'tr',
+  'myrinet', 'xp' and 'usb' netcards (jsc#SLE-7753)
+- 4.2.35
+
 -------------------------------------------------------------------
 Fri Nov 15 09:30:20 UTC 2019 - Josef Reidinger <jreidinger@suse.com>
 

diff --git a/package/yast2.spec b/package/yast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        4.2.34
+Version:        4.2.35
 Release:        0
 Summary:        YaST2 Main Package
 License:        GPL-2.0-only