Merge pull request #1183 from RaspAP/feature/ubuntu20-armbian22

Extend support to Ubuntu 20.04 / Armbian 22

includes/hostapd.php

@@ -7,6 +7,9 @@ require_once 'includes/config.php';
 
 getWifiInterface();
 
+$system = new \RaspAP\System\Sysinfo;
+$os = $system->operatingSystem();
+
 /**
  * Initialize hostapd values, display interface
  *
@@ -15,6 +18,7 @@ function DisplayHostAPDConfig()
 {
     $status = new StatusMessages();
     $system = new \RaspAP\System\Sysinfo;
+    $operatingSystem = $system->operatingSystem();
     $arrConfig = array();
     $arr80211Standard = [
         'a' => '802.11a - 5 GHz',
@@ -119,7 +123,8 @@ function DisplayHostAPDConfig()
             "arrEncType",
             "arrTxPower",
             "txpower",
-            "arrHostapdConf"
+            "arrHostapdConf",
+            "operatingSystem"
         )
     );
 }

includes/system.php

@@ -159,6 +159,8 @@ function DisplaySystem()
     $hostname = $system->hostname();
     $uptime   = $system->uptime();
     $cores    = $system->processorCount();
+    $os       = $system->operatingSystem();
+    $kernel   = $system->kernelVersion();
 
     // mem used
     $memused  = $system->usedMemory();
@@ -215,6 +217,8 @@ function DisplaySystem()
         "hostname",
         "uptime",
         "cores",
+        "os",
+        "kernel",
         "memused",
         "memused_status",
         "memused_led",