From abd0f8075a0cf44b70dcf211fd7d4aeeaf008c06 Mon Sep 17 00:00:00 2001 From: Tim Wilkinson Date: Sat, 16 Dec 2023 21:32:25 -0800 Subject: [PATCH] VMWare support (#1024) --- files/etc/radios.json | 3 +++ files/usr/lib/lua/aredn/nav/admin/65advancednetwork.lua | 2 +- files/www/cgi-bin/admin | 2 +- files/www/cgi-bin/advancednetwork | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/files/etc/radios.json b/files/etc/radios.json index 06b6206a..0801d0c4 100644 --- a/files/etc/radios.json +++ b/files/etc/radios.json @@ -1175,5 +1175,8 @@ }, "qemu standard pc (i440fx + piix, 1996)": { "name": "QEMU PC" + }, + "vmware, inc. vmware virtual platform": { + "name": "VMware PC" } } diff --git a/files/usr/lib/lua/aredn/nav/admin/65advancednetwork.lua b/files/usr/lib/lua/aredn/nav/admin/65advancednetwork.lua index ae8f7fc7..b0ae9570 100644 --- a/files/usr/lib/lua/aredn/nav/admin/65advancednetwork.lua +++ b/files/usr/lib/lua/aredn/nav/admin/65advancednetwork.lua @@ -1,4 +1,4 @@ local board = aredn.hardware.get_board_type() -if board == "mikrotik,hap-ac2" or board == "mikrotik,hap-ac3" or board == "qemu-standard-pc-i440fx-piix-1996" or board == "glinet,gl-b1300" then +if board == "mikrotik,hap-ac2" or board == "mikrotik,hap-ac3" or board == "qemu-standard-pc-i440fx-piix-1996" or board == "glinet,gl-b1300" or board == "VMware, Inc. VMware Virtual Platform" then return { href = "advancednetwork", display = "Advanced Network" } end diff --git a/files/www/cgi-bin/admin b/files/www/cgi-bin/admin index 0dc8e293..bc62716a 100755 --- a/files/www/cgi-bin/admin +++ b/files/www/cgi-bin/admin @@ -284,7 +284,7 @@ if parms.button_refresh_fw then if info then for _, profile in ipairs(info.profiles) do - if profile.id == board_type or (board_type == "qemu-standard-pc-i440fx-piix-1996" and profile.id == "generic" and profile.target == "x86/64") then + if profile.id == board_type or ((board_type == "qemu-standard-pc-i440fx-piix-1996" or board_type == "VMware, Inc. VMware Virtual Platform") and profile.id == "generic" and profile.target == "x86/64") then firmware_versions[ver] = { overview = config_serverpath .. data .. "/" .. profile.target .. "/" .. profile.id .. ".json", target = info.image_url:gsub("{target}", profile.target) diff --git a/files/www/cgi-bin/advancednetwork b/files/www/cgi-bin/advancednetwork index 38f546b8..a13e87ec 100755 --- a/files/www/cgi-bin/advancednetwork +++ b/files/www/cgi-bin/advancednetwork @@ -51,7 +51,8 @@ local default_1_port_layout = { ports = { [1] = "eth0" } } local layouts = { ["mikrotik,hap-ac2"] = default_5_port_layout, ["mikrotik,hap-ac3"] = default_5_port_layout, - ["qemu-standard-pc-i440fx-piix-1996"] = default_1_port_layout + ["qemu-standard-pc-i440fx-piix-1996"] = default_1_port_layout, + ["VMware, Inc. VMware Virtual Platform"] = default_1_port_layout } local default_5_port_config = {