pmcf 1.98.1 → 1.98.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.98.1",
+  "version": "1.98.2",
   "publishConfig": {
     "access": "public"
   },

package/src/dhcp.mjs

@@ -46,6 +46,9 @@ export class DHCPService extends Base {
     };
 
     const commonConfig = {
+      "interfaces-config": {
+        interfaces: ["end0"]
+      },
       "lease-database": {
         type: "memfile",
         "lfc-interval": 3600
@@ -148,9 +151,6 @@ export class DHCPService extends Base {
     const dhcp4 = {
       Dhcp4: {
         ...commonConfig,
-        "interfaces-config": {
-          interfaces: ["end0"]
-        },
         "control-socket": {
           "socket-type": "unix",
           "socket-name": "/run/kea/4-ctrl-socket"
@@ -196,9 +196,6 @@ export class DHCPService extends Base {
     const dhcp6 = {
       Dhcp6: {
         ...commonConfig,
-        "interfaces-config": {
-          interfaces: []
-        },
         "control-socket": {
           "socket-type": "unix",
           "socket-name": "/run/kea/6-ctrl-socket"

package/src/host.mjs

@@ -103,22 +103,18 @@ export class Host extends Base {
   }
 
   _applyExtends(host) {
-    /*  this.depends = host.depends;
-    this.provides = host.provides;
-    this.replaces = host.replaces;
-*/
     for (const service of host.services) {
       this.services = service.forOwner(this);
     }
 
     for (const [name, ni] of host.networkInterfaces) {
-      const present = this.#networkInterfaces.get(name);
-      if (present) {
-        this.info("ALREADY THERE", name);
-      } else {
-        this.info("CLONE NI", name);
-        this.#networkInterfaces.set(name, ni.forOwner(this));
+      let present = this.#networkInterfaces.get(name);
+      if (!present) {
+        present = ni.forOwner(this);
+        this.#networkInterfaces.set(name, present);
       }
+
+      present.extends.push(ni);
     }
   }
 
@@ -496,6 +492,7 @@ export class NetworkInterface extends Base {
   #network;
   #kind;
   #hostName;
+  extends = [];
   arpbridge;
   hwaddr;
 

package/types/host.d.mts

@@ -378,6 +378,7 @@ export class NetworkInterface extends Base {
             };
         };
     };
+    extends: any[];
     arpbridge: any;
     hwaddr: any;
     addSubnet(address: any): any;