penguins-eggs 10.0.19 → 10.0.21

package/dist/classes/distro.js

@@ -102,191 +102,221 @@ class Distro {
             this.releaseLike = 'unstable';
         }
         /**
-         * Analisi: codenameId
+         * Analize distroId
          */
-        switch (this.codenameId) {
-            case 'jessie': {
-                // Debian 8 jessie
-                this.distroLike = 'Debian';
-                this.codenameLikeId = 'jessie';
-                this.liveMediumPath = '/lib/live/mount/medium/';
-                this.isCalamaresAvailable = false;
-                break;
-            }
-            case 'stretch': {
-                // Debian 9 stretch
-                this.distroLike = 'Debian';
-                this.codenameLikeId = 'stretch';
-                this.liveMediumPath = '/lib/live/mount/medium/';
-                this.isCalamaresAvailable = false;
-                break;
-            }
-            case 'buster': {
-                // Debian 10 buster
-                this.distroLike = 'Debian';
-                this.codenameLikeId = 'buster';
-                break;
-            }
-            case 'bullseye': {
-                // Debian 11 bullseye
-                this.distroLike = 'Debian';
-                this.codenameLikeId = 'bullseye';
-                break;
-            }
-            case 'bookworm': {
-                // Debian 12 bookworm
-                this.distroLike = 'Debian';
-                this.codenameLikeId = 'bookworm';
-                break;
-            }
-            case 'trixie': {
-                // Debian 13 trixie
-                this.distroLike = 'Debian';
-                this.codenameLikeId = 'trixie';
-                break;
-            }
-            case 'beowulf': {
-                // Devuab 3 beowulf
-                this.distroLike = 'Devuan';
-                this.codenameLikeId = 'beowulf';
-                break;
-            }
-            case 'chimaera': {
-                // Devuab 4 chimaera
-                this.distroLike = 'Devuan';
-                this.codenameLikeId = 'chimaera';
-                break;
-            }
-            case 'daedalus': {
-                // Devuan 5 daedalus
-                this.distroLike = 'Devuan';
-                this.codenameLikeId = 'daedalus';
-                break;
-            }
-            /**
-             * Ubuntu LTS + actual
-             */
-            case 'bionic': {
-                // Ubuntu 18.04 bionic LTS eol aprile 2023
-                this.distroLike = 'Ubuntu';
-                this.codenameLikeId = 'bionic';
-                this.liveMediumPath = '/lib/live/mount/medium/';
-                break;
-            }
-            case 'focal': {
-                // Ubuntu 20.04 focal LTS
-                this.distroLike = 'Ubuntu';
-                this.codenameLikeId = 'focal';
-                break;
-            }
-            case 'jammy': {
-                // Ubuntu 22.04 jammy LTS
-                this.distroLike = 'Ubuntu';
-                this.codenameLikeId = 'jammy';
-                break;
-            }
-            case 'noble': {
-                // Ubuntu 24.04 noble LTS
-                this.distroLike = 'Ubuntu';
-                this.codenameLikeId = 'noble';
-                break;
-            }
-            case 'devel': {
-                // Ubuntu rhino
-                this.distroLike = 'Ubuntu';
-                this.codenameLikeId = 'devel';
-                break;
-            }
+        if (this.distroId === 'Alpine') {
+            this.familyId = 'alpine';
+            this.distroLike = 'Alpine';
+            this.codenameId = 'rolling'; // questo viene rimosso dal nome
+            this.codenameLikeId = 'alpine-rolling';
+            this.liveMediumPath = '/.modloop/'; // ? è il mount della root su cd di installatione
+            this.squashfs = `live/filesystem.squashfs`;
+            this.syslinuxPath = '/usr/share/syslinux/'; //correct
+            this.pxelinuxPath = this.syslinuxPath;
+            this.usrLibPath = '/usr/lib/';
+            this.memdiskPath = this.syslinuxPath;
+            this.isolinuxPath = this.syslinuxPath;
+            // At the moment
+            this.isCalamaresAvailable = false;
+        }
+        else if (this.distroId === 'Fedora') {
+            this.familyId = 'fedora';
+            this.distroLike = 'Fedora';
+            this.codenameId = 'rolling';
+            this.codenameLikeId = '40';
+            this.liveMediumPath = '/run/install/repo/'; // ? è il mount della root su cd di installatione
+            this.squashfs = `live/filesystem.squashfs`;
+            this.syslinuxPath = '/usr/share/syslinux/';
+            this.pxelinuxPath = this.syslinuxPath;
+            this.usrLibPath = '/usr/lib/';
+            this.memdiskPath = this.syslinuxPath;
+            this.isolinuxPath = this.syslinuxPath;
+            // At the moment
+            this.isCalamaresAvailable = false;
+        }
+        else if (this.distroId === 'openSUSE') {
+            this.familyId = 'suse';
+            this.distroLike = 'openSUSE';
+            this.codenameId = 'rolling';
+            this.codenameLikeId = 'Tumbleweed';
+            this.liveMediumPath = '/run/install/repo/'; // ? è il mount della root su cd di installatione
+            this.squashfs = `live/filesystem.squashfs`;
+            this.syslinuxPath = '/usr/share/syslinux/';
+            this.pxelinuxPath = this.syslinuxPath;
+            this.usrLibPath = '/usr/lib/';
+            this.memdiskPath = this.syslinuxPath;
+            this.isolinuxPath = this.syslinuxPath;
+            // At the moment
+            this.isCalamaresAvailable = false;
+        }
+        else {
             /**
-             * Arch Linux/Garuda
+             * Arch/Debian/Devuan/Manjaro and Ubuntu
              */
-            case 'Spizaetus':
-            case 'n/a':
-            case 'rolling': {
-                if (this.distroId === "Alpine") {
-                    // Alpine
-                    this.familyId = 'alpine';
-                    this.distroLike = 'Alpine';
-                    this.codenameId = 'rolling'; // questo viene rimosso dal nome
-                    this.codenameLikeId = 'alpine-rolling';
-                    this.liveMediumPath = '/.modloop/'; // ? è il mount della root su cd di installatione
-                    this.squashfs = `to/define/filestem.squashfs`;
+            switch (this.codenameId) {
+                case 'jessie': {
+                    // Debian 8 jessie
+                    this.distroLike = 'Debian';
+                    this.codenameLikeId = 'jessie';
+                    this.liveMediumPath = '/lib/live/mount/medium/';
+                    this.isCalamaresAvailable = false;
+                    break;
+                }
+                case 'stretch': {
+                    // Debian 9 stretch
+                    this.distroLike = 'Debian';
+                    this.codenameLikeId = 'stretch';
+                    this.liveMediumPath = '/lib/live/mount/medium/';
+                    this.isCalamaresAvailable = false;
+                    break;
+                }
+                case 'buster': {
+                    // Debian 10 buster
+                    this.distroLike = 'Debian';
+                    this.codenameLikeId = 'buster';
+                    break;
+                }
+                case 'bullseye': {
+                    // Debian 11 bullseye
+                    this.distroLike = 'Debian';
+                    this.codenameLikeId = 'bullseye';
+                    break;
+                }
+                case 'bookworm': {
+                    // Debian 12 bookworm
+                    this.distroLike = 'Debian';
+                    this.codenameLikeId = 'bookworm';
+                    break;
+                }
+                case 'trixie': {
+                    // Debian 13 trixie
+                    this.distroLike = 'Debian';
+                    this.codenameLikeId = 'trixie';
+                    break;
+                }
+                case 'beowulf': {
+                    // Devuab 3 beowulf
+                    this.distroLike = 'Devuan';
+                    this.codenameLikeId = 'beowulf';
+                    break;
+                }
+                case 'chimaera': {
+                    // Devuab 4 chimaera
+                    this.distroLike = 'Devuan';
+                    this.codenameLikeId = 'chimaera';
+                    break;
                 }
-                else {
-                    // Arch,  ArcoLinux, BlendOS, EndeavourOS, Garuda, RebornOS
+                case 'daedalus': {
+                    // Devuan 5 daedalus
+                    this.distroLike = 'Devuan';
+                    this.codenameLikeId = 'daedalus';
+                    break;
+                }
+                /**
+                 * Ubuntu LTS + actual
+                 */
+                case 'bionic': {
+                    // Ubuntu 18.04 bionic LTS eol aprile 2023
+                    this.distroLike = 'Ubuntu';
+                    this.codenameLikeId = 'bionic';
+                    this.liveMediumPath = '/lib/live/mount/medium/';
+                    break;
+                }
+                case 'focal': {
+                    // Ubuntu 20.04 focal LTS
+                    this.distroLike = 'Ubuntu';
+                    this.codenameLikeId = 'focal';
+                    break;
+                }
+                case 'jammy': {
+                    // Ubuntu 22.04 jammy LTS
+                    this.distroLike = 'Ubuntu';
+                    this.codenameLikeId = 'jammy';
+                    break;
+                }
+                case 'noble': {
+                    // Ubuntu 24.04 noble LTS
+                    this.distroLike = 'Ubuntu';
+                    this.codenameLikeId = 'noble';
+                    break;
+                }
+                case 'devel': {
+                    // Ubuntu rhino
+                    this.distroLike = 'Ubuntu';
+                    this.codenameLikeId = 'devel';
+                    break;
+                }
+                /**
+                 * Arch Linux/Garuda
+                 */
+                case 'Spizaetus':
+                case 'n/a':
+                case 'rolling': {
                     this.familyId = 'archlinux';
                     this.distroLike = 'Arch';
                     this.codenameId = 'rolling';
                     this.codenameLikeId = 'rolling';
                     this.liveMediumPath = '/run/archiso/bootmnt/';
                     this.squashfs = `arch/x86_64/airootfs.sfs`;
+                    break;
                 }
-                break;
-            }
-            default: {
-                /**
-                 * patch per Roy VERIFICARE
-                 */
-                let found = false;
-                let file = path.resolve(__dirname, '../../conf/derivatives.yaml');
-                if (fs.existsSync('/etc/penguins-eggs.d/derivatives.yaml')) {
-                    file = '/etc/penguins-eggs.d/derivatives.yaml';
-                }
-                const content = fs.readFileSync(file, 'utf8');
-                const distros = yaml.load(content);
-                for (const distro of distros) {
-                    if (distro.ids !== undefined) {
-                        for (let n = 0; n < distro.ids.length; n++) {
-                            if (this.codenameId === distro.ids[n]) {
-                                found = true;
-                                this.distroLike = distro.distroLike;
-                                this.codenameLikeId = distro.id;
-                                this.familyId = distro.family;
+                default: {
+                    /**
+                     * patch per Roy VERIFICARE
+                     */
+                    let found = false;
+                    let file = path.resolve(__dirname, '../../conf/derivatives.yaml');
+                    if (fs.existsSync('/etc/penguins-eggs.d/derivatives.yaml')) {
+                        file = '/etc/penguins-eggs.d/derivatives.yaml';
+                    }
+                    const content = fs.readFileSync(file, 'utf8');
+                    const distros = yaml.load(content);
+                    for (const distro of distros) {
+                        if (distro.ids !== undefined) {
+                            for (let n = 0; n < distro.ids.length; n++) {
+                                if (this.codenameId === distro.ids[n]) {
+                                    found = true;
+                                    this.distroLike = distro.distroLike;
+                                    this.codenameLikeId = distro.id;
+                                    this.familyId = distro.family;
+                                }
                             }
                         }
                     }
-                }
-                if (!found) {
-                    console.log(`This distro ${this.distroId}/${this.codenameId} is not yet recognized!`);
-                    console.log('');
-                    console.log('You can edit /usr/lib/penguins-eggs/conf/derivatives.yaml to add it -');
-                    console.log('after that - run: sudo eggs dad -d to re-configure eggs.');
-                    console.log('If you can create your new iso, you can contribute to the project');
-                    console.log('by suggesting your modification.');
-                    process.exit(0);
+                    if (!found) {
+                        console.log(`This distro ${this.distroId}/${this.codenameId} is not yet recognized!`);
+                        console.log('');
+                        console.log('You can edit /usr/lib/penguins-eggs/conf/derivatives.yaml to add it -');
+                        console.log('after that - run: sudo eggs dad -d to re-configure eggs.');
+                        console.log('If you can create your new iso, you can contribute to the project');
+                        console.log('by suggesting your modification.');
+                        process.exit(0);
+                    }
                 }
             }
+            /**
+             * setting paths: syslinux, isolinux, usrLibPath
+             */
+            switch (this.familyId) {
+                case 'debian': {
+                    this.isolinuxPath = '/usr/lib/ISOLINUX/';
+                    this.syslinuxPath = '/usr/lib/syslinux/modules/bios/';
+                    this.pxelinuxPath = '/usr/lib/PXELINUX/';
+                    this.memdiskPath = '/usr/lib/syslinux/';
+                    this.usrLibPath = '/usr/lib/' + Utils.usrLibPath();
+                    break;
+                }
+                case 'archlinux': {
+                    this.syslinuxPath = '/usr/lib/syslinux/bios/';
+                    this.pxelinuxPath = this.syslinuxPath;
+                    this.usrLibPath = '/usr/lib/';
+                    this.memdiskPath = this.syslinuxPath;
+                    this.isolinuxPath = this.syslinuxPath;
+                    break;
+                }
+                // No default
+            } // Fine analisi codenameId
         }
-        /**
-         * setting paths: syslinux, isolinux, usrLibPath
-         */
-        switch (this.familyId) {
-            case 'debian': {
-                this.isolinuxPath = '/usr/lib/ISOLINUX/';
-                this.syslinuxPath = '/usr/lib/syslinux/modules/bios/';
-                this.pxelinuxPath = '/usr/lib/PXELINUX/';
-                this.memdiskPath = '/usr/lib/syslinux/';
-                this.usrLibPath = '/usr/lib/' + Utils.usrLibPath();
-                break;
-            }
-            case 'archlinux': {
-                this.syslinuxPath = '/usr/lib/syslinux/bios/';
-                this.pxelinuxPath = this.syslinuxPath;
-                this.usrLibPath = '/usr/lib/';
-                this.memdiskPath = this.syslinuxPath;
-                this.isolinuxPath = this.syslinuxPath;
-                break;
-            }
-            case 'alpine': {
-                this.syslinuxPath = '/usr/share/syslinux/'; //correct
-                this.pxelinuxPath = this.syslinuxPath;
-                this.usrLibPath = '/usr/lib/';
-                this.memdiskPath = this.syslinuxPath;
-                this.isolinuxPath = this.syslinuxPath;
-                break;
-            }
-            // No default
-        } // Fine analisi codenameId
         /**
          * if lsb-release exists
          */

package/dist/classes/families/fedora.js

@@ -24,7 +24,7 @@ export default class Fedora {
             await exec(`dnf install ${this.packs4calamares.join(' ')}`, echo);
         }
         catch {
-            Utils.error(`Fedora.calamaresInstall() pacman -Sy ${this.packs4calamares.join(' ')}`); // + e.error)
+            Utils.error(`fedora.calamaresInstall()`);
         }
     }
     /**
@@ -42,8 +42,7 @@ export default class Fedora {
         if (fs.existsSync('/etc/calamares')) {
             await exec('rm /etc/calamares -rf', echo);
         }
-        // yay???
-        await exec('yay -Rns calamares', echo);
+        await exec('dnf remove calamares', echo);
         return retVal;
     }
     /**
@@ -91,7 +90,6 @@ export default class Fedora {
      */
     static packageIsInstalled(packageName) {
         let installed = false;
-        // rpm -qa | grep -i nano
         const cmd = `/usr/bin/dnf list --installed ${packageName}`;
         const stdout = shx.exec(cmd, { silent: true }).stdout.trim();
         if (stdout.includes(packageName)) {

package/dist/classes/families/{suse.d.ts → opensuse.d.ts}

@@ -9,7 +9,7 @@
  * Utils: general porpourse utils
  * @remarks all the utilities
  */
-export default class Suse {
+export default class Opensuse {
     static packs4calamares: string[];
     /**
      *

package/dist/classes/families/{suse.js → opensuse.js}

@@ -13,7 +13,7 @@ import Utils from '../utils.js';
  * Utils: general porpourse utils
  * @remarks all the utilities
  */
-export default class Suse {
+export default class Opensuse {
     static packs4calamares = ['calamares'];
     /**
      *
@@ -24,7 +24,7 @@ export default class Suse {
             await exec(`zypper install ${this.packs4calamares.join(' ')}`, echo);
         }
         catch {
-            Utils.error(`Fedora.calamaresInstall() pacman -Sy ${this.packs4calamares.join(' ')}`); // + e.error)
+            Utils.error(`Opensuse.calamaresInstall()`);
         }
     }
     /**
@@ -33,9 +33,8 @@ export default class Suse {
     static async calamaresPolicies() {
         const policyFile = '/usr/share/polkit-1/actions/com.github.calamares.calamares.policy';
         /**
-         * Su fedora occorre vedere come fare!
+         * Su openSuse occorre vedere come fare!
          */
-        // await exec(`sed -i 's/auth_admin/yes/' ${policyFile}`)
     }
     /**
      *

package/dist/classes/ovary.d.ts

@@ -83,18 +83,26 @@ export default class Ovary {
      */
     finished(scriptOnly?: boolean): void;
     /**
-     * initrdArch()
-     * necessita di echoYes
+     * initrdAlpine()
      */
-    initrdArch(): Promise<void>;
+    initrdAlpine(): Promise<void>;
+    /**
+     * initrdFedora()
+     */
+    initrdFedora(): Promise<void>;
+    /**
+     * initrdSuse()
+     */
+    initrdSuse(): Promise<void>;
     /**
      * initrdArch()
      * necessita di echoYes
      */
-    initrdAlpine(): Promise<void>;
+    initrdArch(): Promise<void>;
     /**
+     * initrdDebian()
+     * Actually based on live* packages
      * We must upgrade to initrdCreate for Debian/Ubuntu
-     * @returns
      */
     initrdDebian(verbose?: boolean): Promise<void>;
     /**

package/dist/classes/ovary.js

@@ -703,15 +703,43 @@ export default class Ovary {
             console.log(`Note: format UDF, generated by ${chalk.cyanBright('genisoimage')}`);
         }
     }
+    /**
+     * initrdAlpine()
+     */
+    async initrdAlpine() {
+        Utils.warning(`creating ${path.basename(this.settings.initrdImg)} Alpine on ISO/live`);
+        let initrdImg = 'initramfs-lts';
+        // dracut
+        // const pathConf = path.resolve(__dirname, `../../dracut/dracut.conf.d`)
+        // await exec(`dracut --confdir ${pathConf} ${this.settings.iso_work}live/${initrdImg}`, Utils.setEcho(true))
+        // mkinitfs
+        const pathConf = path.resolve(__dirname, `../../mkinitfs/live.conf`);
+        await exec(`mkinitfs -c ${pathConf} -o ${this.settings.iso_work}live/${initrdImg}`, Utils.setEcho(true));
+        const sidecar = path.resolve(__dirname, `../../mkinitfs/sidecar.sh`);
+        await exec(`cp ${sidecar} ${this.settings.iso_work}live/`);
+    }
+    /**
+     * initrdFedora()
+     */
+    async initrdFedora() {
+        Utils.warning(`creating ${path.basename(this.settings.initrdImg)} Fedora on ISO/live`);
+        await exec(`cp /boot/initramfs-*.img ${this.settings.iso_work}/live/`, this.echo);
+    }
+    /**
+     * initrdSuse()
+     */
+    async initrdSuse() {
+        Utils.warning(`creating ${path.basename(this.settings.initrdImg)} Fedora on ISO/live`);
+        await exec(`cp /boot/initrd-* ${this.settings.iso_work}/live/`, this.echo);
+    }
     /**
      * initrdArch()
      * necessita di echoYes
      */
     async initrdArch() {
-        Utils.warning(`creating ${path.basename(this.settings.initrdImg)} on ISO/live`);
         let initrdImg = Utils.initrdImg();
         initrdImg = initrdImg.slice(Math.max(0, initrdImg.lastIndexOf('/') + 1));
-        Utils.warning(`Creating ${initrdImg} in ${this.settings.iso_work}live/`);
+        Utils.warning(`creating ${path.basename(this.settings.initrdImg)} ArchLinux on ISO/live`);
         const { distroId } = this.settings.distro;
         let fileConf = 'arch';
         if (isMiso(distroId)) {
@@ -724,26 +752,12 @@ export default class Ovary {
         await exec(`mkinitcpio -c ${pathConf} -g ${this.settings.iso_work}live/${initrdImg}`, Utils.setEcho(true));
     }
     /**
-     * initrdArch()
-     * necessita di echoYes
-     */
-    async initrdAlpine() {
-        Utils.warning(`creating ${path.basename(this.settings.initrdImg)} on ISO/live`);
-        let initrdImg = Utils.initrdImg();
-        //initrdImg = initrdImg.slice(Math.max(0, initrdImg.lastIndexOf('/') + 1))
-        Utils.warning(`Creating ${initrdImg} in ${this.settings.iso_work}live/`);
-        const { distroId } = this.settings.distro;
-        // da cambiare ...
-        let fileConf = 'arch';
-        const pathConf = path.resolve(__dirname, `../../mkinitcpio/${fileConf}/live.conf`);
-        await exec(`mkinitcpio -c ${pathConf} -g ${this.settings.iso_work}live/${initrdImg}`, Utils.setEcho(true));
-    }
-    /**
+     * initrdDebian()
+     * Actually based on live* packages
      * We must upgrade to initrdCreate for Debian/Ubuntu
-     * @returns
      */
     async initrdDebian(verbose = false) {
-        Utils.warning(`creating ${path.basename(this.settings.initrdImg)} on ISO/live`);
+        Utils.warning(`creating ${path.basename(this.settings.initrdImg)} Debian/Devuan/Ubuntu on ISO/live`);
         let isCrypted = false;
         if (fs.existsSync('/etc/crypttab')) {
             isCrypted = true;
@@ -1446,15 +1460,24 @@ export default class Ovary {
                 await this.isolinux(this.theme);
                 await this.kernelCopy();
                 /**
-                 * we need different behaviour on
-                 * initrd for different familis
+                 * we need different initfs
+                 * for different families
                  */
-                if (this.familyId === 'debian') {
-                    await this.initrdDebian();
-                }
-                else if (this.familyId === 'archlinux') {
+                if (this.familyId === 'archlinux') {
                     await this.initrdArch();
                 }
+                else if (this.familyId === 'alpine') {
+                    await this.initrdAlpine();
+                }
+                else if (this.familyId === 'fedora') {
+                    await this.initrdFedora();
+                }
+                else if (this.familyId === 'suse') {
+                    await this.initrdSuse();
+                }
+                else if (this.familyId === 'debian') {
+                    await this.initrdDebian();
+                }
                 if (this.settings.config.make_efi) {
                     await this.makeEfi(this.theme);
                 }

package/dist/classes/utils.d.ts

@@ -11,10 +11,10 @@
  */
 export default class Utils {
     /**
-  * Custom function to sort object keys
-  * @param obj
-  * @returns
-  */
+    * Custom function to sort object keys
+    * @param obj
+    * @returns
+    */
     static sortObjectKeys(obj: {
         [key: string]: any;
     }): {

package/dist/classes/utils.js

@@ -29,11 +29,10 @@ const __dirname = path.dirname(new URL(import.meta.url).pathname);
  */
 export default class Utils {
     /**
-  * Custom function to sort object keys
-  * @param obj
-  * @returns
-  */
-    // 
+    * Custom function to sort object keys
+    * @param obj
+    * @returns
+    */
     static sortObjectKeys(obj) {
         const sorted = {};
         Object.keys(obj)
@@ -110,14 +109,19 @@ export default class Utils {
     static vmlinuz() {
         let distro = new Distro();
         let vmlinuz = '';
-        // patch per raspberry arm64
         // find vmlinuz in /proc/cmdline
         const cmdline = fs.readFileSync('/proc/cmdline', 'utf8').split(" ");
         cmdline.forEach(cmd => {
             if (cmd.includes('BOOT_IMAGE')) {
                 vmlinuz = cmd.substring(cmd.indexOf('=') + 1);
-                if (!fs.existsSync(vmlinuz) && fs.existsSync(`/boot${vmlinuz}`)) {
-                    vmlinuz = `/boot${vmlinuz}`;
+                // patch per fedora BOOT_IMAGE=(hd0,gpt2)/vmlinuz-6.9.9-200.fc40.x86_64
+                if (vmlinuz.includes(")")) {
+                    vmlinuz = cmd.substring(cmd.indexOf(')') + 1);
+                }
+                if (!fs.existsSync(vmlinuz)) {
+                    if (fs.existsSync(`/boot/${vmlinuz}`)) {
+                        vmlinuz = `/boot/${vmlinuz}`;
+                    }
                 }
             }
         });