system: merge info and dmi routes

also return uptimeSecs instead of abstract date

src/system.js

@@ -17,7 +17,6 @@ exports = module.exports = {
     runSystemChecks,
     getProvider,
     getCpus,
-    getDmi
 };
 
 const apps = require('./apps.js'),
@@ -282,10 +281,16 @@ async function reboot() {
 async function getInfo() {
     // https://serverfault.com/questions/92932/how-does-ubuntu-keep-track-of-the-system-restart-required-flag-in-motd
     const rebootRequired = fs.existsSync('/var/run/reboot-required');
-    const uptime = safe.child_process.execSync('uptime -s', { encoding: 'utf8' });
+    const uptime = safe.fs.readFileSync('/proc/uptime', 'utf8');
+    const uptimeSecs = parseInt(uptime.split(' ')[0], 10);
+
+    const sysVendor = safe.fs.readFileSync('/sys/devices/virtual/dmi/id/sys_vendor', 'utf8');
+    const productName = safe.fs.readFileSync('/sys/devices/virtual/dmi/id/product_name', 'utf8');
 
     return {
-        uptime,
+        sysVendor,
+        productName,
+        uptimeSecs,
         rebootRequired
     };
 }
@@ -376,13 +381,3 @@ function getProvider() {
 async function getCpus() {
     return os.cpus();
 }
-
-async function getDmi() {
-    const sysVendor = safe.fs.readFileSync('/sys/devices/virtual/dmi/id/sys_vendor', 'utf8');
-    const productName = safe.fs.readFileSync('/sys/devices/virtual/dmi/id/product_name', 'utf8');
-
-    return {
-        sysVendor,
-        productName
-    };
-}