penguins-eggs 25.7.7 → 25.7.10

package/dist/classes/pxe.js

@@ -18,6 +18,7 @@ import Utils from './utils.js';
 import Diversions from './diversions.js';
 // _dirname
 const __dirname = path.dirname(new URL(import.meta.url).pathname);
+const bootloaders = path.resolve(__dirname, `../../bootloaders`);
 /**
  * Pxe:
  */
@@ -208,16 +209,16 @@ export default class Pxe {
         await exec(`cp ${__dirname}/../../addons/eggs/theme/livecd/isolinux.theme.cfg ${this.pxeRoot}/isolinux.theme.cfg`, this.echo);
         await exec(`cp ${__dirname}/../../addons/eggs/theme/livecd/splash.png ${this.pxeRoot}/splash.png`, this.echo);
         // ipxe.pxe
-        await exec(`ln -s ${__dirname}/../../ipxe/ipxe.pxe ${this.pxeRoot}/ipxe.pxe`, this.echo);
+        await exec(`ln -s ${bootloaders}ipxe.pxe ${this.pxeRoot}/ipxe.pxe`, this.echo);
         // pxe
-        await exec(`cp ${this.distro.syslinuxPath}/pxelinux.0 ${this.pxeRoot}/pxelinux.0`, this.echo);
-        await exec(`cp ${this.distro.syslinuxPath}/lpxelinux.0 ${this.pxeRoot}/lpxelinux.0`, this.echo);
+        await exec(`cp ${bootloaders}/syslinux/pxelinux.0 ${this.pxeRoot}/pxelinux.0`, this.echo);
+        await exec(`cp ${bootloaders}/syslinux/lpxelinux.0 ${this.pxeRoot}/lpxelinux.0`, this.echo);
         // syslinux
-        await exec(`ln -s ${this.distro.syslinuxPath}/ldlinux.c32 ${this.pxeRoot}/ldlinux.c32`, this.echo);
-        await exec(`ln -s ${this.distro.syslinuxPath}/vesamenu.c32 ${this.pxeRoot}/vesamenu.c32`, this.echo);
-        await exec(`ln -s ${this.distro.syslinuxPath}/libcom32.c32 ${this.pxeRoot}/libcom32.c32`, this.echo);
-        await exec(`ln -s ${this.distro.syslinuxPath}/libutil.c32 ${this.pxeRoot}/libutil.c32`, this.echo);
-        await exec(`ln -s ${this.distro.syslinuxPath}/memdisk ${this.pxeRoot}/memdisk`, this.echo);
+        await exec(`ln -s ${bootloaders}/syslinux/ldlinux.c32 ${this.pxeRoot}/ldlinux.c32`, this.echo);
+        await exec(`ln -s ${bootloaders}/syslinux/vesamenu.c32 ${this.pxeRoot}/vesamenu.c32`, this.echo);
+        await exec(`ln -s ${bootloaders}/syslinux/libcom32.c32 ${this.pxeRoot}/libcom32.c32`, this.echo);
+        await exec(`ln -s ${bootloaders}/syslinux/libutil.c32 ${this.pxeRoot}/libutil.c32`, this.echo);
+        await exec(`ln -s ${bootloaders}/syslinux/memdisk ${this.pxeRoot}/memdisk`, this.echo);
         await exec(`mkdir ${this.pxeRoot}/pxelinux.cfg`, this.echo);
         let content = '';
         content += '# eggs: pxelinux.cfg/default\n';
@@ -257,14 +258,17 @@ export default class Pxe {
         /**
          * On Debian bookworm:
          * cd ~/penguins-eggs
-         * cp /usr/lib/grub/x86_64-efi-signed/grubnetx64.efi.signed ./ipxe/
-         * cp -r /usr/lib/grub/x86_64-efi/ ./ipxe/grub
+         * cp /usr/lib/grub/x86_64-efi-signed/grubnetx64.efi.signed ./bootloaders/
+         * cp -r /usr/lib/grub/x86_64-efi/ ./bootloaders/grub/x86_64-efi/
          */
         await exec(`mkdir -p ${this.pxeRoot}/grub`, this.echo);
-        await exec(`cp ${__dirname}/../../ipxe/grubnetx64.efi.signed ${this.pxeRoot}/grub.efi`);
-        await exec(`cp -r ${__dirname}/../../ipxe/grub/* ${this.pxeRoot}/grub`);
-        // dato che Alpine cerca i moduli in: /grub/x86_64-efi, la accontentiamo...
-        await exec(`ln -s ${__dirname}/../../ipxe/grub/ ${this.pxeRoot}/grub/x86_64-efi`);
+        /**
+         * Si potrebbe usare:
+         * ${bootloaders}/grub/x86_64-efi/monolithic/grubnetx64.efi
+         * come alternativa per distroname!=="Debian"
+         */
+        await exec(`cp ${bootloaders}/grubnetx64.efi.signed ${this.pxeRoot}/grub.efi`, this.echo);
+        await exec(`cp -r ${bootloaders}/grub/x86_64-efi ${this.pxeRoot}/grub`, this.echo);
         // Genera il file grub.cfg
         const grubName = `${this.pxeRoot}/grub/grub.cfg`; // Il file deve chiamarsi grub.cfg
         let grubContent = '';

package/package.json

@@ -2,7 +2,7 @@
   "name": "penguins-eggs",
   "shortName": "eggs",
   "description": "A remaster system tool, compatible with Arch, Debian, Devuan, Ubuntu and others",
-  "version": "25.7.7",
+  "version": "25.7.10",
   "author": "Piero Proietti",
   "bin": {
     "eggs": "./bin/run.js"
@@ -50,13 +50,13 @@
     "@types/read": "^0.0.32",
     "@types/shelljs": "^0.8.17",
     "@types/ws": "^8.18.1",
-    "chai": "^5.2.0",
+    "chai": "^5.2.1",
     "eslint": "^9.30.1",
     "eslint-config-oclif": "^6.0.83",
     "eslint-config-prettier": "^10.1.5",
     "glob": "^11.0.3",
     "mocha": "^11.7.0",
-    "oclif": "^4.20.4",
+    "oclif": "^4.20.5",
     "perrisbrewery": "^10",
     "prettier": "^3.6.2",
     "shx": "^0.4.0",
@@ -72,19 +72,18 @@
     "/addons",
     "/assets",
     "/bin",
+    "/bootloaders",
     "/conf",
     "/dist",
     "/dracut",
     "/eui",
-    "/ipxe",
     "/maker",
     "/manpages",
     "/mkinitcpio",
     "/mkinitfs",
     "/perrisbrewery",
     "/pods",
-    "/scripts",
-    "/syslinux"
+    "/scripts"
   ],
   "homepage": "https://penguins-eggs.net",
   "keywords": [

package/dist/penguins-eggs_25.7.7-1_amd64.deb.sha256

@@ -1 +0,0 @@
-668d65d25999cbc944c52e7b3bca1ba325b9c2722f0f9a8564be3d115e044ae1  penguins-eggs_25.7.7-1_amd64.deb