penguins-eggs 25.7.7 → 25.7.10

package/.oclif.manifest.json

@@ -1614,5 +1614,5 @@
       ]
     }
   },
-  "version": "25.7.7"
+  "version": "25.7.10"
 }

package/README.md

@@ -513,7 +513,7 @@ EXAMPLES
   $ eggs adapt
 ```
 
-_See code: [src/commands/adapt.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.7/src/commands/adapt.ts)_
+_See code: [src/commands/adapt.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.10/src/commands/adapt.ts)_
 
 ## `eggs analyze`
 
@@ -534,7 +534,7 @@ EXAMPLES
   sudo eggs analyze
 ```
 
-_See code: [src/commands/analyze.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.7/src/commands/analyze.ts)_
+_See code: [src/commands/analyze.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.10/src/commands/analyze.ts)_
 
 ## `eggs autocomplete [SHELL]`
 
@@ -565,7 +565,7 @@ EXAMPLES
   $ eggs autocomplete --refresh-cache
 ```
 
-_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v3.2.31/src/commands/autocomplete/index.ts)_
+_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v3.2.32/src/commands/autocomplete/index.ts)_
 
 ## `eggs calamares`
 
@@ -598,7 +598,7 @@ EXAMPLES
   sudo eggs calamares --remove
 ```
 
-_See code: [src/commands/calamares.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.7/src/commands/calamares.ts)_
+_See code: [src/commands/calamares.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.10/src/commands/calamares.ts)_
 
 ## `eggs config`
 
@@ -625,7 +625,7 @@ EXAMPLES
   sudo eggs config --clean --nointeractive
 ```
 
-_See code: [src/commands/config.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.7/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.10/src/commands/config.ts)_
 
 ## `eggs cuckoo`
 
@@ -645,7 +645,7 @@ EXAMPLES
   sudo eggs cuckoo
 ```
 
-_See code: [src/commands/cuckoo.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.7/src/commands/cuckoo.ts)_
+_See code: [src/commands/cuckoo.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.10/src/commands/cuckoo.ts)_
 
 ## `eggs dad`
 
@@ -674,7 +674,7 @@ EXAMPLES
   sudo dad --default
 ```
 
-_See code: [src/commands/dad.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.7/src/commands/dad.ts)_
+_See code: [src/commands/dad.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.10/src/commands/dad.ts)_
 
 ## `eggs export iso`
 
@@ -699,7 +699,7 @@ EXAMPLES
   $ eggs export iso --clean
 ```
 
-_See code: [src/commands/export/iso.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.7/src/commands/export/iso.ts)_
+_See code: [src/commands/export/iso.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.10/src/commands/export/iso.ts)_
 
 ## `eggs export pkg`
 
@@ -726,7 +726,7 @@ EXAMPLES
   $ eggs export pkg --all
 ```
 
-_See code: [src/commands/export/pkg.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.7/src/commands/export/pkg.ts)_
+_See code: [src/commands/export/pkg.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.10/src/commands/export/pkg.ts)_
 
 ## `eggs export tarballs`
 
@@ -750,7 +750,7 @@ EXAMPLES
   $ eggs export tarballs --clean
 ```
 
-_See code: [src/commands/export/tarballs.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.7/src/commands/export/tarballs.ts)_
+_See code: [src/commands/export/tarballs.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.10/src/commands/export/tarballs.ts)_
 
 ## `eggs help [COMMAND]`
 
@@ -770,7 +770,7 @@ DESCRIPTION
   Display help for eggs.
 ```
 
-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v6.2.29/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v6.2.30/src/commands/help.ts)_
 
 ## `eggs install`
 
@@ -812,7 +812,7 @@ EXAMPLES
   sudo eggs install --chroot
 ```
 
-_See code: [src/commands/install.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.7/src/commands/install.ts)_
+_See code: [src/commands/install.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.10/src/commands/install.ts)_
 
 ## `eggs kill`
 
@@ -835,7 +835,7 @@ EXAMPLES
   sudo eggs kill
 ```
 
-_See code: [src/commands/kill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.7/src/commands/kill.ts)_
+_See code: [src/commands/kill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.10/src/commands/kill.ts)_
 
 ## `eggs krill`
 
@@ -897,7 +897,7 @@ EXAMPLES
   $ eggs auto
 ```
 
-_See code: [src/commands/love.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.7/src/commands/love.ts)_
+_See code: [src/commands/love.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.10/src/commands/love.ts)_
 
 ## `eggs mom`
 
@@ -917,7 +917,7 @@ EXAMPLES
   $ eggs mom
 ```
 
-_See code: [src/commands/mom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.7/src/commands/mom.ts)_
+_See code: [src/commands/mom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.10/src/commands/mom.ts)_
 
 ## `eggs pods [DISTRO]`
 
@@ -944,7 +944,7 @@ EXAMPLES
   $ eggs pods ubuntu
 ```
 
-_See code: [src/commands/pods.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.7/src/commands/pods.ts)_
+_See code: [src/commands/pods.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.10/src/commands/pods.ts)_
 
 ## `eggs produce`
 
@@ -1005,7 +1005,7 @@ EXAMPLES
   sudo eggs produce --excludes home    # exclude ~/*
 ```
 
-_See code: [src/commands/produce.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.7/src/commands/produce.ts)_
+_See code: [src/commands/produce.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.10/src/commands/produce.ts)_
 
 ## `eggs status`
 
@@ -1026,7 +1026,7 @@ EXAMPLES
   $ eggs status
 ```
 
-_See code: [src/commands/status.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.7/src/commands/status.ts)_
+_See code: [src/commands/status.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.10/src/commands/status.ts)_
 
 ## `eggs syncfrom`
 
@@ -1052,7 +1052,7 @@ EXAMPLES
   sudo eggs syncfrom --file /path/to/luks-volume
 ```
 
-_See code: [src/commands/syncfrom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.7/src/commands/syncfrom.ts)_
+_See code: [src/commands/syncfrom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.10/src/commands/syncfrom.ts)_
 
 ## `eggs syncto`
 
@@ -1079,7 +1079,7 @@ EXAMPLES
   sudo eggs syncto --excludes
 ```
 
-_See code: [src/commands/syncto.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.7/src/commands/syncto.ts)_
+_See code: [src/commands/syncto.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.10/src/commands/syncto.ts)_
 
 ## `eggs tools clean`
 
@@ -1101,7 +1101,7 @@ EXAMPLES
   sudo eggs tools clean
 ```
 
-_See code: [src/commands/tools/clean.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.7/src/commands/tools/clean.ts)_
+_See code: [src/commands/tools/clean.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.10/src/commands/tools/clean.ts)_
 
 ## `eggs tools ppa`
 
@@ -1127,7 +1127,7 @@ EXAMPLES
   sudo eggs tools ppa --remove
 ```
 
-_See code: [src/commands/tools/ppa.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.7/src/commands/tools/ppa.ts)_
+_See code: [src/commands/tools/ppa.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.10/src/commands/tools/ppa.ts)_
 
 ## `eggs tools skel`
 
@@ -1151,7 +1151,7 @@ EXAMPLES
   sudo eggs tools skel --user user-to-be-copied
 ```
 
-_See code: [src/commands/tools/skel.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.7/src/commands/tools/skel.ts)_
+_See code: [src/commands/tools/skel.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.10/src/commands/tools/skel.ts)_
 
 ## `eggs tools stat`
 
@@ -1177,7 +1177,7 @@ EXAMPLES
   $ eggs tools stat --year
 ```
 
-_See code: [src/commands/tools/stat.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.7/src/commands/tools/stat.ts)_
+_See code: [src/commands/tools/stat.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.10/src/commands/tools/stat.ts)_
 
 ## `eggs tools yolk`
 
@@ -1198,7 +1198,7 @@ EXAMPLES
   sudo eggs tools yolk
 ```
 
-_See code: [src/commands/tools/yolk.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.7/src/commands/tools/yolk.ts)_
+_See code: [src/commands/tools/yolk.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.10/src/commands/tools/yolk.ts)_
 
 ## `eggs update`
 
@@ -1219,7 +1219,7 @@ EXAMPLES
   $ eggs update
 ```
 
-_See code: [src/commands/update.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.7/src/commands/update.ts)_
+_See code: [src/commands/update.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.10/src/commands/update.ts)_
 
 ## `eggs version`
 
@@ -1265,7 +1265,7 @@ EXAMPLES
   $ eggs wardrobe get your-wardrobe
 ```
 
-_See code: [src/commands/wardrobe/get.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.7/src/commands/wardrobe/get.ts)_
+_See code: [src/commands/wardrobe/get.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.10/src/commands/wardrobe/get.ts)_
 
 ## `eggs wardrobe list [REPO]`
 
@@ -1294,7 +1294,7 @@ EXAMPLES
   $ eggs wardrobe list --distro arch
 ```
 
-_See code: [src/commands/wardrobe/list.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.7/src/commands/wardrobe/list.ts)_
+_See code: [src/commands/wardrobe/list.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.10/src/commands/wardrobe/list.ts)_
 
 ## `eggs wardrobe show [REPO]`
 
@@ -1324,7 +1324,7 @@ EXAMPLES
   $ eggs wardrobe show accessories/
 ```
 
-_See code: [src/commands/wardrobe/show.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.7/src/commands/wardrobe/show.ts)_
+_See code: [src/commands/wardrobe/show.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.10/src/commands/wardrobe/show.ts)_
 
 ## `eggs wardrobe wear [REPO]`
 
@@ -1355,7 +1355,7 @@ EXAMPLES
   sudo eggs wardrobe wear wagtail/waydroid
 ```
 
-_See code: [src/commands/wardrobe/wear.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.7/src/commands/wardrobe/wear.ts)_
+_See code: [src/commands/wardrobe/wear.ts](https://github.com/pieroproietti/penguins-eggs/blob/v25.7.10/src/commands/wardrobe/wear.ts)_
 <!-- commandsstop -->
 
 # GUI

package/bootloaders/README.md

@@ -0,0 +1,22 @@
+# bootloaders
+
+To boot from live, We use bootloaders from Debian bookworm for every distro.
+
+## grub
+* grub/grubx64.efi.signed (boot from live cd)
+* grub/grubnetx64.efi.signed (boot from network)
+* grub/shimx64.efi.signed as bootx64.efi
+* grub/x86_64-efi (modules)
+
+## ipxe
+* /ipxe.pxe (booting pxe on UEFI)
+* /undionly.kpxe (booting from BIOS)
+
+## syslinux
+* /syslinux
+
+# Path signed/unsigned
+* /usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed
+* /usr/lib/grub/x86_64-efi/monolithic/grubx64.efi
+* /usr/lib/shim/shimx64.efi.signed
+* /usr/lib/shim/shimx64.efi

package/dist/classes/ovary.d/fertilization.js

@@ -20,6 +20,7 @@ export async function fertilization(snapshot_prefix = '', snapshot_basename = ''
     const distro = new Distro();
     this.familyId = distro.familyId;
     this.distroId = distro.distroId;
+    this.distroLike = distro.distroLike;
     this.settings = new Settings();
     if (await this.settings.load()) {
         await this.settings.loadRemix(this.theme);

package/dist/classes/ovary.d/initrd.js

@@ -21,7 +21,7 @@ export async function initrdAlpine() {
     let initrdImg = Utils.initrdImg();
     initrdImg = initrdImg.slice(Math.max(0, initrdImg.lastIndexOf('/') + 1));
     const pathConf = path.resolve(__dirname, `../../../mkinitfs/live.conf`);
-    await exec(`mkinitfs -c ${pathConf} -o ${this.settings.iso_work}live/${initrdImg} ${this.kernel}`, Utils.setEcho(true));
+    await exec(`mkinitfs -c ${pathConf} -o ${this.settings.iso_work}live/${initrdImg} ${this.kernel}`, this.echo);
 }
 /**
  * initrdArch
@@ -51,9 +51,9 @@ export async function initrdArch() {
         await exec(`cp ${hookSrc} ${hookDest}`);
     }
     await exec(`cp ${hookSrc} ${hookSaved}`);
-    await exec(edit, Utils.setEcho(true));
+    await exec(edit, this.echo);
     let cmd = `mkinitcpio -c ${fileConf} -g ${this.settings.iso_work}live/${path.basename(this.initrd)} -k ${this.kernel}`;
-    await exec(cmd, Utils.setEcho(true));
+    await exec(cmd, this.echo);
     await exec(`rm -f ${hookDest}`);
     if (restore) {
         await exec(`cp ${hookSaved} ${hookDest}`);

package/dist/classes/ovary.d/make-efi.d.ts

@@ -7,6 +7,10 @@
  */
 import Ovary from '../ovary.js';
 /**
- * makeEFI
+ *
+ * @param this
+ * @param theme
+ * cp /usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed ./bootloaders/
+ * cp /usr/lib/shim/shimx64.efi.signed ./bootloaders/
  */
 export declare function makeEfi(this: Ovary, theme?: string): Promise<void>;

package/dist/classes/ovary.d/make-efi.js

@@ -16,42 +16,32 @@ import Utils from '../utils.js';
 // _dirname
 const __dirname = path.dirname(new URL(import.meta.url).pathname);
 /**
- * makeEFI
+ *
+ * @param this
+ * @param theme
+ * cp /usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed ./bootloaders/
+ * cp /usr/lib/shim/shimx64.efi.signed ./bootloaders/
  */
 export async function makeEfi(theme = 'eggs') {
-    Utils.warning("creating efi configuration...");
+    const bootloaders = path.resolve(__dirname, `../../../bootloaders`);
+    const grubEfi = path.resolve(bootloaders, `grubx64.efi`);
+    const shimEfi = path.resolve(bootloaders, `shimx64.efi`);
+    let signed = '';
+    if (this.distroLike === 'Debian') {
+        Utils.warning(`Secure boot enabled on ${this.distroLike}`);
+        signed = '.signed';
+    }
     const efiPath = path.join(this.settings.config.snapshot_mnt, '/efi/');
     const efiWorkDir = path.join(efiPath, '/work/');
     const efiMemdiskDir = path.join(efiPath, '/memdisk/');
-    const efiMnt = path.join(efiPath, '/mnt/');
+    const efiMnt = path.join(efiPath, 'mnt');
     const isoDir = this.settings.iso_work;
-    const readmes = `${isoDir}/READMES`;
-    let readmeContent = `# README\n`;
-    /**
-     * check: grub/grub2 command MUST to exists
-     */
-    const grubName = Diversions.grubName(this.familyId);
-    if (grubName === '') {
-        Utils.error('Cannot find command grub/grub2.');
-        process.exit(1);
-    }
-    /**
-     * GAE = Grub Arch Efi path+grubx86.efi/signed
-     */
-    let GAE = srcGAES();
-    if (!fs.existsSync(srcGAE())) {
-        GAE = srcGAE();
-    }
-    if (!fs.existsSync(GAE)) {
-        if (this.familyId === 'debian') {
-            Utils.error(`error: ${GAE} does not exist`);
-            if (!Utils.isi686()) {
-                process.exit(1);
-            }
-        }
-    }
-    // Create READMES on ISO
-    await exec(`mkdir ${readmes}`);
+    // creo e copio direttamente in ${isdDir} il folder ${bootloaders}/grub/x86_64-efi
+    await exec(`mkdir ${isoDir}/boot/grub/ -p`, this.echo);
+    await exec(`cp -r ${bootloaders}/grub/x86_64-efi ${isoDir}/boot/grub/`, this.echo);
+    await exec(`mkdir ${isoDir}/EFI/boot -p`, this.echo);
+    await exec(`cp ${shimEfi}${signed} ${isoDir}/EFI/boot/${bootEFI()}`, this.echo);
+    await exec(`cp ${grubEfi}${signed} ${isoDir}/EFI/boot/${grubEFI()}`, this.echo);
     // clean/create all in efiPath
     if (fs.existsSync(efiPath)) {
         await exec(`rm -rf ${efiPath}`);
@@ -60,21 +50,19 @@ export async function makeEfi(theme = 'eggs') {
     await exec(`mkdir ${efiMemdiskDir}`, this.echo);
     await exec(`mkdir ${efiMnt}`, this.echo);
     await exec(`mkdir ${efiWorkDir}`, this.echo);
-    const grub1 = `${efiMemdiskDir}/boot/grub/grub.cfg`;
-    let grubText1 = `# grub.cfg 1\n`;
     /**
      * create efi.img
      */
-    await exec(`mkdir ${path.join(efiMemdiskDir, "/boot")}`, this.echo);
-    await exec(`mkdir ${path.join(efiMemdiskDir, "/boot/grub")}`, this.echo);
-    // create grub.cfg 1 in memdisk
-    Utils.warning("creating grub.cfg (1) in (efi.img)/boot/grub");
+    Utils.warning("creating grub.cfg (1) on efi.img");
+    await exec(`mkdir ${path.join(efiMemdiskDir, "/boot/grub -p")}`, this.echo);
+    const grubCfg1 = `${efiMemdiskDir}/boot/grub/grub.cfg`;
+    let grubText1 = `# grub.cfg 1\n`;
     grubText1 += `# created on ${efiMemdiskDir}\n`;
     grubText1 += `\n`;
     grubText1 += `search --set=root --file /.disk/id/${this.uuid}\n`;
     grubText1 += 'set prefix=($root)/boot/grub\n';
     grubText1 += `configfile ($root)/boot/grub/grub.cfg\n`;
-    Utils.write(grub1, grubText1);
+    Utils.write(grubCfg1, grubText1);
     /**
      * creating structure efiWordDir
      */
@@ -93,55 +81,24 @@ export async function makeEfi(theme = 'eggs') {
     const efiImg = `${efiWorkDir}boot/grub/efi.img`;
     await exec(`dd if=/dev/zero of=${efiImg} bs=1M count=16`, this.echo);
     await exec(`/sbin/mkdosfs -F 12 ${efiImg}`, this.echo);
-    // mount efi.img on mnt-img
-    await exec(`mount -o loop ${efiImg} ${efiMnt}`, this.echo);
-    // create structure inside efiMnt
-    await exec(`mkdir ${efiMnt}/boot`, this.echo);
-    await exec(`mkdir ${efiMnt}/boot/grub`, this.echo);
-    await exec(`mkdir ${efiMnt}/boot/grub/x86_64-efi`, this.echo);
-    await exec(`cp -r /usr/lib/grub/x86_64-efi/*.mod ${efiMnt}/boot/grub/x86_64-efi/`, this.echo);
-    await exec(`mkdir ${efiMnt}/EFI`, this.echo);
-    await exec(`mkdir ${efiMnt}/EFI/boot`, this.echo);
+    // await new Promise(resolve => setTimeout(resolve, 2000))
+    // mount efi.img on mountpoint mnt-img
+    await exec(`mount --make-shared -o loop ${efiImg} ${efiMnt}`, this.echo);
+    // await new Promise(resolve => setTimeout(resolve, 2000))
+    // create structure inside (efi.img)
+    await exec(`mkdir -p ${efiMnt}/boot/grub`, this.echo);
+    await exec(`mkdir -p ${efiMnt}/EFI/boot`, this.echo);
     /**
-     * copy grub.cfg to (efi.img)/boot/grub
+     * copy grubCfg1 (grub.cfg) to (efi.img)/boot/grub
      */
-    await exec(`cp ${grub1} ${efiMnt}/boot/grub`);
-    // readme
-    readmeContent += `## copyng on (efi.img) ${efiMnt}\n`;
-    readmeContent += `${grub1} copied to /boot/grub`;
-    if (this.settings.distro.codenameLikeId === 'bookworm' ||
-        this.settings.distro.codenameLikeId === 'daedalus') {
-        /**
-         * (efi.img)/EFI/boot/bootx84.efi (shimx64.efi)
-         * (efi.img)/EFI/boot/grubx84.efi
-         */
-        Utils.warning(`copy ${srcShim()} to ${efiMnt}/EFI/boot/${bootArchEfi()}`);
-        Utils.warning(`copy ${srcGAES()} to ${efiMnt}/EFI/boot/${nameGAE()}`);
-        await exec(`cp ${srcShim()} ${efiMnt}/EFI/boot/${bootArchEfi()}`, this.echo);
-        await exec(`cp ${srcGAES()} ${efiMnt}/EFI/boot/${nameGAE()}`, this.echo);
-        readmeContent += `${srcShim()} copied as  ${bootArchEfi()}\n`;
-        readmeContent += `${GAE} copied as ${nameGAE()}\n`;
-    }
-    else {
-        /**
-         * we need to build bootx64.efi
-         */
-        Utils.warning(`create ${bootArchEfi()} not signed and copy as ${bootArchEfi()}`);
-        await exec(`${grubName}-mkimage  -O "${Utils.uefiFormat()}" \
-                -m "${efiMemdiskDir}/memdisk" \
-                -o "${efiMemdiskDir}/${bootArchEfi()}" \
-                -p '(memdisk)/boot/grub' \
-                search iso9660 configfile normal memdisk tar cat part_msdos part_gpt fat ext2 ntfs ntfscomp hfsplus chain boot linux squash4 loopback`, this.echo);
-        await exec(`cp ${efiMemdiskDir}/${bootArchEfi()} ${efiMnt}/EFI/boot/`, this.echo);
-        // Rolf patch: copiare i file mod da /usr/lib/grub/x86_64-efi a ${isoDir}/boot/grub/x86_64-efi
-        await exec(`cp -r /usr/lib/grub/x86_64-efi/*.mod ${isoDir}/boot/grub/x86_64-efi/`, this.echo);
-        // Creare EFI
-        readmeContent += `created grubx64.efi not signed and copied as  ${bootArchEfi()}\n`;
-    }
-    // replicate EFI on ISO
-    await exec(`cp -r ${efiMnt}/EFI ${isoDir}/EFI`, this.echo);
-    // umount efiMnt
+    await exec(`cp ${grubCfg1} ${efiMnt}/boot/grub`, this.echo);
+    await exec(`cp ${shimEfi}${signed} ${efiMnt}/EFI/boot/${bootEFI()}`, this.echo);
+    await exec(`cp ${grubEfi}${signed} ${efiMnt}/EFI/boot/${grubEFI()}`, this.echo);
+    //await Utils.pressKeyToExit(`controlla ${efiMnt}`)
     await exec(`umount ${efiMnt}`, this.echo);
+    // Copy isoImg in ${${isoDir}/boot/grub
+    Utils.warning("copyng efi.img on (iso)/boot/grub");
+    await exec(`cp ${efiImg} ${isoDir}/boot/grub`, this.echo);
     /**
      * creating grub.cfg (2) on (iso)/boot/grub
      */
@@ -181,9 +138,6 @@ export async function makeEfi(theme = 'eggs') {
     }
     // Copy workdir files to ISO/boot
     await exec(`rsync -avx  ${efiWorkDir}/boot ${isoDir}/`, this.echo);
-    readmeContent += `\n`;
-    readmeContent += `## Copyng on ${isoDir}\n`;
-    readmeContent += `rsync -avx ${efiWorkDir}/boot (iso)/boot\n`;
     /**
      * prepare main grub.cfg from grub.main.cfg
      */
@@ -196,7 +150,7 @@ export async function makeEfi(theme = 'eggs') {
         process.exit(1);
     }
     const kernel_parameters = Diversions.kernelParameters(this.familyId, this.volid); // this.kernelParameters()
-    const g2 = path.join(isoDir, '/boot/grub/grub.cfg');
+    const grubCfg2 = path.join(isoDir, '/boot/grub/grub.cfg');
     const template = fs.readFileSync(grubTemplate, 'utf8');
     const view = {
         fullname: this.settings.remix.fullname.toUpperCase(),
@@ -206,10 +160,10 @@ export async function makeEfi(theme = 'eggs') {
         vmlinuz: `/live/${path.basename(this.vmlinuz)}`
     };
     let grubText2 = `# grub.cfg 2\n`;
-    grubText2 += ` # created on ${g2}`;
+    grubText2 += ` # created on ${grubCfg2}`;
     grubText2 += `\n`;
     grubText2 += mustache.render(template, view);
-    fs.writeFileSync(g2, grubText2);
+    fs.writeFileSync(grubCfg2, grubText2);
     /**
      * create loopback.cfg
      */
@@ -222,15 +176,15 @@ export async function makeEfi(theme = 'eggs') {
      * config.cfg
      */
     await exec(`cp ${path.resolve(__dirname, `../../../assets/config.cfg`)} ${isoDir}/boot/grub`);
-    fs.writeFileSync(`${readmes}/grub1.cfg`, grubText1);
-    fs.writeFileSync(`${readmes}/grub2.cfg`, grubText2);
-    fs.writeFileSync(`${readmes}/README.md`, readmeContent);
 }
+/**
+ * FUNCTIONS
+ */
 /**
  *
  * @returns
  */
-function bootArchEfi() {
+function bootEFI() {
     let bn = 'bootia32.efi'; // Per l'architettura i686 EFI è: bootia32.efi
     if (process.arch === 'x64') {
         bn = 'bootx64.efi';
@@ -241,9 +195,10 @@ function bootArchEfi() {
     return bn;
 }
 /**
- * FUNCTIONS
+ *
+ * @returns
  */
-function nameGAE() {
+function grubEFI() {
     let gn = 'grubia32.efi'; // Per l'architettura i686 EFI è: grubia32.efi
     if (process.arch === 'x64') {
         gn = 'grubx64.efi';
@@ -253,21 +208,6 @@ function nameGAE() {
     }
     return gn;
 }
-function nameGAES() {
-    return nameGAE() + '.signed';
-}
-function srcGAE() {
-    return '/usr/lib/grub/' + Utils.uefiFormat() + '/monolithic/' + nameGAE();
-}
-function srcGAES() {
-    let signedGrub = `/usr/lib/grub/${Utils.uefiFormat()}-signed/${nameGAES()}`;
-    if (!fs.existsSync(signedGrub)) {
-        Utils.warning(`warning: ${signedGrub} does not exist`);
-    }
-    return signedGrub;
-}
-function srcShim() {
-    const signedShim = '/usr/lib/shim/shimx64.efi.signed';
-    const unsignedShim = '/usr/lib/shim/shimx64.efi';
-    return fs.existsSync(signedShim) ? signedShim : unsignedShim;
+function moduleEFI() {
+    return `x86_64-efi`;
 }

package/dist/classes/ovary.d/syslinux.js

@@ -17,11 +17,12 @@ import Diversions from './../diversions.js';
 import Utils from './../utils.js';
 // _dirname
 const __dirname = path.dirname(new URL(import.meta.url).pathname);
+const bootloaders = path.resolve(__dirname, `../../../bootloaders`);
 /**
    * syslinux: da syspath
    */
 export async function syslinux(theme = 'eggs') {
-    let syspath = path.resolve(__dirname, `../../../syslinux`);
+    let syspath = path.join(bootloaders, 'syslinux');
     await exec(`cp ${syspath}/chain.c32 ${this.settings.iso_work}/isolinux/`, this.echo);
     await exec(`cp ${syspath}/isohdpfx.bin ${this.settings.iso_work}/isolinux/`, this.echo);
     // just fo x64 arch

package/dist/classes/ovary.d.ts

@@ -38,6 +38,7 @@ export default class Ovary {
     echo: {};
     familyId: string;
     distroId: string;
+    distroLike: string;
     genisoimage: boolean;
     incubator: Incubator;
     nest: string;

package/dist/classes/ovary.js

@@ -40,6 +40,7 @@ export default class Ovary {
     echo = {};
     familyId = '';
     distroId = '';
+    distroLike = '';
     genisoimage = false;
     incubator = {};
     nest = '';