pmcf 1.47.1 → 1.48.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/bin/pmcf-host-defs +3 -3
  2. package/package.json +1 -1
  3. package/src/host.mjs +4 -3
  4. package/src/utils.mjs +1 -1
  5. package/types/host.d.mts +14 -9
package/bin/pmcf-host-defs CHANGED
@@ -37,8 +37,8 @@ async function generateMachineInfo(host, dir) {
37
37
  }).map(([k, v]) => `${k}=${v}`)
38
38
  );
39
39
 
40
- await writeLines(etcDir, "machine-id", [host["machine-id"]]);
41
- await writeLines(etcDir, "hostname", [host.hostName]);
40
+ await writeLines(etcDir, "machine-id", host["machine-id"]);
41
+ await writeLines(etcDir, "hostname", host.hostName);
42
42
  }
43
43
 
44
44
  async function generateNetworkDefs(host, dir) {
@@ -105,7 +105,7 @@ async function generateNetworkDefs(host, dir) {
105
105
  })
106
106
  );
107
107
 
108
- if (ni.arpbridge.length) {
108
+ if (ni.arpbridge) {
109
109
  networkSections.push(
110
110
  "",
111
111
  sectionLines("Link", { Promiscuous: "yes" })
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pmcf",
3
- "version": "1.47.1",
3
+ "version": "1.48.0",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
package/src/host.mjs CHANGED
@@ -23,14 +23,13 @@ const HostTypeDefinition = {
23
23
  },
24
24
  services: { type: "service", collection: true, writeable: true },
25
25
  os: { type: "string", collection: false, writeable: true },
26
+ "machine-id": { type: "string", collection: false, writeable: true },
26
27
  distribution: { type: "string", collection: false, writeable: true },
27
28
  deployment: { type: "string", collection: false, writeable: true },
28
29
  master: { type: "boolean", collection: false, writeable: true },
29
- model: { type: "string", collection: false, writeable: false },
30
30
  serial: { type: "string", collection: false, writeable: true },
31
31
  vendor: { type: "string", collection: false, writeable: true },
32
32
  chassis: { type: "string", collection: false, writeable: true },
33
- isModel: { type: "boolean", collection: false, writeable: false },
34
33
  priority: { type: "number", collection: false, writeable: true },
35
34
  replaces: { type: "string", collection: true, writeable: true },
36
35
  depends: { type: "string", collection: true, writeable: true },
@@ -38,7 +37,9 @@ const HostTypeDefinition = {
38
37
  extends: { type: "host", collection: true, writeable: true },
39
38
  cidrAddresses: { type: "string", collection: true, writeable: false },
40
39
  rawAddresses: { type: "string", collection: true, writeable: false },
41
- rawAddress: { type: "string", collection: false, writeable: false }
40
+ rawAddress: { type: "string", collection: false, writeable: false },
41
+ model: { type: "string", collection: false, writeable: false },
42
+ isModel: { type: "boolean", collection: false, writeable: false }
42
43
  }
43
44
  };
44
45
 
package/src/utils.mjs CHANGED
@@ -5,7 +5,7 @@ export async function writeLines(dir, name, lines) {
5
5
  await mkdir(dir, { recursive: true });
6
6
  return writeFile(
7
7
  join(dir, name),
8
- [...lines]
8
+ [...asArray(lines)]
9
9
  .flat()
10
10
  .filter(line => line !== undefined)
11
11
  .map(l => l + "\n")
package/types/host.d.mts CHANGED
@@ -51,22 +51,22 @@ export class Host extends Base {
51
51
  collection: boolean;
52
52
  writeable: boolean;
53
53
  };
54
- distribution: {
54
+ "machine-id": {
55
55
  type: string;
56
56
  collection: boolean;
57
57
  writeable: boolean;
58
58
  };
59
- deployment: {
59
+ distribution: {
60
60
  type: string;
61
61
  collection: boolean;
62
62
  writeable: boolean;
63
63
  };
64
- master: {
64
+ deployment: {
65
65
  type: string;
66
66
  collection: boolean;
67
67
  writeable: boolean;
68
68
  };
69
- model: {
69
+ master: {
70
70
  type: string;
71
71
  collection: boolean;
72
72
  writeable: boolean;
@@ -86,11 +86,6 @@ export class Host extends Base {
86
86
  collection: boolean;
87
87
  writeable: boolean;
88
88
  };
89
- isModel: {
90
- type: string;
91
- collection: boolean;
92
- writeable: boolean;
93
- };
94
89
  priority: {
95
90
  type: string;
96
91
  collection: boolean;
@@ -131,6 +126,16 @@ export class Host extends Base {
131
126
  collection: boolean;
132
127
  writeable: boolean;
133
128
  };
129
+ model: {
130
+ type: string;
131
+ collection: boolean;
132
+ writeable: boolean;
133
+ };
134
+ isModel: {
135
+ type: string;
136
+ collection: boolean;
137
+ writeable: boolean;
138
+ };
134
139
  };
135
140
  };
136
141
  postinstall: any[];