fix bugs, add config merging

Sineware · Nov 1, 2023 · d3f6cbc · d3f6cbc
1 parent a736859
commit d3f6cbc
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 4 deletions.
diff --git a/cli-src/plctl.ts b/cli-src/plctl.ts
@@ -117,6 +117,9 @@ async function main() {
             console.log("Cloud Ready (Authenticated): " + res.ocsReady);
             if((await isPL2())) console.log("Selected Root: " + res.selectedRoot);
             if((await isPL2())) console.log("Locked Root: " + res.lockedRoot);
+            if((await isPL2())) console.log("Hostname: " + res.hostname);
+            if((await isPL2())) console.log("KExec Disabled: " + res.disable_kexec);
+            if((await isPL2())) console.log("Build Info: " + res.buildInfo.product + " " + res.buildInfo.variant + " " + res.buildInfo.channel + " " + res.buildInfo.arch + " - " + res.buildInfo.buildnum + "," + res.buildInfo.uuid + " (" + res.buildInfo.builddate + ")");
             process.exit(0);
         });
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -24,10 +24,12 @@
   },
   "dependencies": {
     "@ltd/j-toml": "^1.37.0",
+    "@types/lodash": "^4.14.200",
     "axios": "^1.3.4",
     "commander": "^10.0.0",
     "dotenv": "^16.0.3",
     "is-reachable": "^5.2.1",
+    "lodash": "^4.17.21",
     "node-pty": "^0.10.1",
     "uuid": "^9.0.0",
     "ws": "^8.11.0",

diff --git a/src/constants.ts b/src/constants.ts
@@ -23,7 +23,8 @@ export interface ProLinuxInfo {
     channel: string,
     builddate: string,
     filename: string,
-    arch: string
+    arch: string,
+    deviceinfoCodename: string
 }
 
 export interface RemoteUpdate {

diff --git a/src/helpers/getProLinuxInfo.ts b/src/helpers/getProLinuxInfo.ts
@@ -4,6 +4,10 @@ export async function getProLinuxInfo(): Promise<ProLinuxInfo> {
     const prolinuxInfo = fs.readFileSync('/opt/build-info/prolinux-info.txt', 'utf8');
     // "4,c5e3ff5b-1aba-4796-80dd-8622ec4f9cc6,prolinux,embedded,dev,Thu Sep 21 11:04:27 PM EDT 2023,prolinux-root-embedded-dev.squish,x64"
     const [buildnum, uuid, product, variant, channel, builddate, filename, arch] = prolinuxInfo.split(',');
+
+    // read /sineware/deviceinfo_codename file, get the string
+    const deviceinfoCodename = fs.readFileSync('/sineware/deviceinfo_codename', 'utf8');
+
     return {
         buildnum,
         uuid,
@@ -12,7 +16,8 @@ export async function getProLinuxInfo(): Promise<ProLinuxInfo> {
         channel,
         builddate,
         filename,
-        arch
+        arch,
+        deviceinfoCodename
     };
 
 }
diff --git a/src/index.ts b/src/index.ts
@@ -5,6 +5,8 @@ import { WebSocket } from "ws";
 import isReachable from "is-reachable";
 import * as TOML from '@ltd/j-toml';
 import axios from "axios";
+import * as _ from "lodash";
+
 import { log, logger } from "./logging";
 import { OCS2Connection } from "./modules/ocs2/cloudapi";
 import { loadPL2Module } from "./modules/pl2";
@@ -52,7 +54,8 @@ export let config = {
 async function main() {
     // Read configuration file
     try {
-        config = TOML.parse(fs.readFileSync(process.env.CONFIG_FILE ?? path.join(__dirname, "prolinux.toml"), "utf-8")) as typeof config;
+        const tomlConfig = TOML.parse(fs.readFileSync(process.env.CONFIG_FILE ?? path.join(__dirname, "prolinux.toml"), "utf-8")) as typeof config;
+        config = _.merge(config, tomlConfig);
         log.info("Configuration file loaded!");
         log.info(JSON.stringify(config, null, 4));
     } catch(e) {
@@ -131,7 +134,7 @@ async function main() {
                         replyResult(LocalActions.SET_HOSTNAME, true, {});
                     } break;
                     case LocalActions.SET_DISABLE_KEXEC: {
-                        config.pl2.disable_kexec = msg.payload.disable_kexec;
+                        config.pl2.disable_kexec = msg.payload.disableKexec;
                         saveConfig();
                         replyResult(LocalActions.SET_DISABLE_KEXEC, true, {});
                     } break;
@@ -150,6 +153,7 @@ async function main() {
                                     selectedRoot: config.pl2.selected_root,
                                     lockedRoot: config.pl2.locked_root,
                                     hostname: config.pl2.hostname,
+                                    disable_kexec: config.pl2.disable_kexec,
                                     buildInfo: await getProLinuxInfo(),
                                     config: config
                                 },