x86: add/improve support for Sophos SG/XG products

* Better product ID for Sophos SG/XG-105 models
* Add support for Sophos SG/XG-135 r1, r2 with/without wireless

Signed-off-by: Stan Grishin <stangri@melmac.ca>
[Changed subject to x86 - probably eaten somewhere, the PR had it]
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

diff --git a/target/linux/x86/base-files/etc/board.d/02_network b/target/linux/x86/base-files/etc/board.d/02_network
index 2a07518096d84c5f47b4e3fca7afb4a6ac1edb91..21238a5df1cad1cb0134094472b7dae61225f121 100644 (file)
--- a/target/linux/x86/base-files/etc/board.d/02_network
+++ b/target/linux/x86/base-files/etc/board.d/02_network
@@ -17,9 +17,16 @@ pc-engines-apu1|pc-engines-apu2|pc-engines-apu3)
 roqos-roqos-core-rc10)
        ucidef_set_interfaces_lan_wan "eth1" "eth0"
        ;;
-sophos-sg-105|sophos-xg-105)
+sophos-sg-105r1|sophos-xg-105r1| \
+sophos-sg-105r2|sophos-xg-105r2)
        ucidef_set_interfaces_lan_wan "eth0 eth2 eth3" "eth1"
        ;;
+sophos-sg-135r1|sophos-xg-135r1| \
+sophos-sg-135Wr1|sophos-xg-135Wr1| \
+sophos-sg-135r2|sophos-xg-135r2| \
+sophos-sg-135Wr2|sophos-xg-135Wr2)
+       ucidef_set_interfaces_lan_wan "eth0 eth2 eth3 eth4 eth5 eth6 eth7" "eth1"
+       ;;
 traverse-technologies-geos)
        ucidef_set_interface_lan "eth0 eth1"
        ucidef_add_atm_bridge "0" "35" "llc" "bridged"

diff --git a/target/linux/x86/base-files/lib/preinit/01_sysinfo b/target/linux/x86/base-files/lib/preinit/01_sysinfo
index 682ce4a5bbedecd93b31061022fa58b477870578..0687f4ca13817a5c8e5c404ad1dfae3a0938b499 100644 (file)
--- a/target/linux/x86/base-files/lib/preinit/01_sysinfo
+++ b/target/linux/x86/base-files/lib/preinit/01_sysinfo
@@ -23,9 +23,11 @@ do_sysinfo_x86() {
                        break
                        ;;
                "Sophos:SG"|"Sophos:XG")
-                       case "$(cat /sys/devices/virtual/dmi/id/product_version 2>/dev/null)" in
-                       105*)
-                               product="${product}-105"
+                       local product_version
+                       product_version="$(cat /sys/devices/virtual/dmi/id/product_version 2>/dev/null)"
+                       case "$product_version" in
+                       105*|135*)
+                               product="${product}-${product_version}"
                                break
                                ;;
                        esac