pmcf 6.39.9 → 6.39.11

package/package.json

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

package/src/base.mjs

@@ -220,7 +220,15 @@ export class base extends core {
     return this.content?.packageData();
   }
 
-  async *preparePackages(stagingDir) {}
+  async *preparePackages(stagingDir) {
+    const pd = await this.packageData;
+
+    pd.sources.push(...(await Array.fromAsync(this.templateContent())));
+
+    if (pd.sources.length) {
+      yield pd;
+    }
+  }
 
   get templateTransformers() {
     return [

package/src/core-service.mjs

@@ -270,18 +270,6 @@ export class CoreService extends base {
     );
   }
 
-  async *preparePackages(dir) {
-    const pd = await this.packageData;
-
-    pd.sources = await Array.fromAsync(
-      this.templateContent()
-    );
-
-    if (pd.sources.length) {
-      yield pd;
-    }
-  }
-
   dnsRecordsForDomainName(domainName, hasSVRRecords) {
     const records = [];
 

package/src/network-interfaces/ethernet.mjs

@@ -11,7 +11,7 @@ export class ethernet extends NetworkInterface {
     }
   };
 
-  static commonNamePattern = /^(eth|end|en)\d+$/;
+  static commonNamePattern = /^(eth|end|en|enx)[\da-zA-Z]+$/;
 
   static {
     addType(this);

package/src/services/bind.mjs

@@ -809,7 +809,7 @@ export class bind extends CoreService {
 
     packageData.sources.push(new FileContentProvider({ dir: dir + "/" }));
 
-    const outputControl = { packageData, dir, permissions };
+    const outputControl = { packageData, dir };
 
     for (const key of this.keys.values()) {
       await key.packageContent(outputControl);