penguins-eggs 9.0.31 → 9.0.35

package/lib/classes/krill_install.js

@@ -153,12 +153,13 @@ class Hatching {
                 // restoring users data
                 message = "Restore private data from backup ";
                 percent = 0.37;
+                let cmd = 'eggs syncfrom --rootdir /tmp/calamares-krill-root/';
                 try {
                     redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent, spinner: true }));
-                    await (0, utils_2.exec)('eggs syncfrom --rootdir /tmp/calamares-krill-root/', this.echo);
+                    await (0, utils_2.exec)(cmd, utils_1.default.setEcho(true));
                 }
                 catch (error) {
-                    await utils_1.default.pressKeyToExit(JSON.stringify(error));
+                    await utils_1.default.pressKeyToExit(cmd);
                 }
             }
             // sources-yolk
@@ -449,8 +450,21 @@ adduser ${name} \
     async delLiveUser() {
         if (utils_1.default.isLive()) {
             const user = this.settings.config.user_opt;
-            const cmd = `chroot ${this.installTarget} deluser --remove-home ${user} ${this.toNull}`;
-            await (0, utils_2.exec)(cmd, this.echo);
+            let cmd = `#!/bin/sh\ngetent passwd "${user}"  > /dev/null`;
+            let userExists = false;
+            try {
+                await (0, utils_2.exec)(cmd, utils_1.default.setEcho(this.verbose));
+                userExists = true;
+            }
+            catch (error) {
+                // console.log(error)
+            }
+            finally {
+                if (userExists) {
+                    const cmd = `chroot ${this.installTarget} deluser --remove-home ${user} ${this.toNull}`;
+                    await (0, utils_2.exec)(cmd, this.echo);
+                }
+            }
         }
     }
     /**

package/lib/classes/ovary.d.ts

@@ -8,7 +8,6 @@ import Users from './users';
 export default class Ovary {
     verbose: boolean;
     echo: {};
-    echoYes: {};
     toNull: string;
     incubator: Incubator;
     settings: Settings;

package/lib/classes/ovary.js

@@ -42,7 +42,6 @@ class Ovary {
     constructor() {
         this.verbose = false;
         this.echo = {};
-        this.echoYes = {};
         this.toNull = '';
         this.incubator = {};
         this.settings = {};
@@ -84,7 +83,6 @@ class Ovary {
     async produce(backup = false, scriptOnly = false, yolkRenew = false, release = false, myAddons, verbose = false) {
         this.verbose = verbose;
         this.echo = utils_2.default.setEcho(verbose);
-        this.echoYes = utils_2.default.setEcho(true);
         if (this.verbose) {
             this.toNull = ' > /dev/null 2>&1';
         }
@@ -123,11 +121,15 @@ class Ovary {
                 await bleach.clean(verbose);
             }
             if (backup) {
-                console.log(`eggs will remove all the users from live. Following servers datas will included on a crypted LUKS volume:`);
+                console.log(`eggs will remove all users and services data from live. Following datas will included on a crypted LUKS volume:`);
                 const users = await this.usersFill();
                 for (let i = 0; i < users.length; i++) {
                     if (users[i].saveIt) {
-                        console.log(`- user: ${users[i].login.padEnd(16)} \thome: ${users[i].home}`);
+                        let utype = 'user   ';
+                        if (parseInt(users[i].uid) < 1000) {
+                            utype = 'service';
+                        }
+                        console.log(`- ${utype}: ${users[i].login.padEnd(16)} \thome: ${users[i].home}`);
                         if (users[i].login !== 'root') {
                             this.addRemoveExclusion(true, users[i].home);
                         }
@@ -135,7 +137,7 @@ class Ovary {
                 }
             }
             else {
-                utils_2.default.warning('eggs will remove all the users from live, but servers datas will be included uncrypted');
+                utils_2.default.warning('eggs will remove all the users data from live, but all services data will be included uncrypted');
             }
             /**
              * NOTE: reCreate = false
@@ -175,19 +177,19 @@ class Ovary {
                     await this.createXdgAutostart(this.settings.config.theme, myAddons);
                     if ((0, displaymanager_1.displaymanager)() === '') {
                         // If GUI is installed and not Desktop manager
-                        cliAutologin.addIssue(this.settings.distro.distroId, this.settings.distro.versionId, this.settings.config.user_opt, this.settings.config.user_opt_passwd, this.settings.config.root_passwd, this.settings.work_dir.merged);
-                        cliAutologin.addMotd(this.settings.distro.distroId, this.settings.distro.versionId, this.settings.config.user_opt, this.settings.config.user_opt_passwd, this.settings.config.root_passwd, this.settings.work_dir.merged);
+                        cliAutologin.addIssue(this.settings.distro.distroId, this.settings.distro.codenameId, this.settings.config.user_opt, this.settings.config.user_opt_passwd, this.settings.config.root_passwd, this.settings.work_dir.merged);
+                        cliAutologin.addMotd(this.settings.distro.distroId, this.settings.distro.codenameId, this.settings.config.user_opt, this.settings.config.user_opt_passwd, this.settings.config.root_passwd, this.settings.work_dir.merged);
                     }
                 }
                 else {
-                    cliAutologin.addAutologin(this.settings.distro.distroId, this.settings.distro.versionId, this.settings.config.user_opt, this.settings.config.user_opt_passwd, this.settings.config.root_passwd, this.settings.work_dir.merged);
+                    cliAutologin.addAutologin(this.settings.distro.distroId, this.settings.distro.codenameId, this.settings.config.user_opt, this.settings.config.user_opt_passwd, this.settings.config.root_passwd, this.settings.work_dir.merged);
                 }
                 await this.editLiveFs();
                 await this.makeSquashfs(scriptOnly);
                 await this.uBindLiveFs(); // Lo smonto prima della fase di backup
             }
             if (backup) {
-                await (0, utils_1.exec)('eggs syncto', this.echo);
+                await (0, utils_1.exec)('eggs syncto', utils_2.default.setEcho(true));
                 utils_2.default.warning(`moving ${luksFile} in ${this.settings.config.snapshot_dir}ovarium/iso/live`);
                 await (0, utils_1.exec)(`mv ${luksFile} ${this.settings.config.snapshot_dir}ovarium/iso/live`, this.echo);
             }
@@ -564,7 +566,7 @@ class Ovary {
         let initrdImg = utils_2.default.initrdImg();
         initrdImg = initrdImg.substring(initrdImg.lastIndexOf('/') + 1);
         utils_2.default.warning(`Creating ${initrdImg} in ${this.settings.work_dir.pathIso}/live/`);
-        await (0, utils_1.exec)(`mkinitcpio -c ${node_path_1.default.resolve(__dirname, '../../mkinitcpio/manjaro/mkinitcpio.conf')} -g ${this.settings.work_dir.pathIso}/live/${initrdImg}`, this.echoYes);
+        await (0, utils_1.exec)(`mkinitcpio -c ${node_path_1.default.resolve(__dirname, '../../mkinitcpio/manjaro/mkinitcpio.conf')} -g ${this.settings.work_dir.pathIso}/live/${initrdImg}`, utils_2.default.setEcho(true));
     }
     /**
      * We must upgrade to initrdCreate for Debian/Ubuntu
@@ -645,7 +647,7 @@ class Ovary {
         utils_2.default.writeX(`${this.settings.work_dir.path}mksquashfs`, cmd);
         if (!scriptOnly) {
             utils_2.default.warning('squashing filesystem: ' + compression);
-            await (0, utils_1.exec)(cmd, this.echoYes);
+            await (0, utils_1.exec)(cmd, utils_2.default.setEcho(true));
         }
     }
     /**
@@ -967,7 +969,7 @@ class Ovary {
         // pve
         if (myAddons.pve) {
             /**
-             * create service pve-lite
+             * create service pve-live
              */
             const pve = new pve_live_1.default();
             pve.create(this.settings.work_dir.merged);
@@ -1088,7 +1090,7 @@ class Ovary {
         const memdiskDir = this.settings.work_dir.path + 'memdiskDir';
         const efiWorkDir = this.settings.efi_work;
         const isoDir = this.settings.work_dir.pathIso;
-        const versionLike = this.settings.distro.versionLike;
+        const codenameLikeId = this.settings.distro.codenameLikeId;
         /**
          * il pachetto grub/grub2 DEVE essere presente
          */
@@ -1239,7 +1241,7 @@ class Ovary {
         const grubDest = `${isoDir}/boot/grub/grub.cfg`;
         const template = fs.readFileSync(grubTemplate, 'utf8');
         // let rmModules = ''
-        // if (this.settings.distro.versionLike === 'focal') {
+        // if (this.settings.distro.codenameLikeId === 'focal') {
         // rmModules = 'rmmod tpm'
         // }
         const view = {
@@ -1296,9 +1298,9 @@ class Ovary {
         this.settings.isoFilename = prefix + volid + postfix;
         const output = this.settings.config.snapshot_dir + this.settings.isoFilename;
         let command = '';
-        const appid = `-appid "${this.settings.distro.distroId}" `;
-        const publisher = `-publisher "${this.settings.distro.distroId}/${this.settings.distro.versionId}" `;
-        const preparer = '-preparer "prepared by eggs <https://penguins-eggs.net>" ';
+        // const appid = `-appid "${this.settings.distro.distroId}" `
+        // const publisher = `-publisher "${this.settings.distro.distroId}/${this.settings.distro.codenameId}" `
+        // const preparer = '-preparer "prepared by eggs <https://penguins-eggs.net>" '
         let isoHybridMbr = ``;
         if (this.settings.config.make_isohybrid) {
             const isolinuxFile = this.settings.distro.isolinuxPath + 'isohdpfx.bin';
@@ -1356,26 +1358,27 @@ class Ovary {
           * -isohybrid-gpt-basdat
           *         isohybrid-apm-hfsplus
           * boot1 CD1
-          */
+        
         command = `xorriso -as mkisofs \
-     -r \
-     -checksum_algorithm_iso md5,sha1,sha256,sha512 \
-     -V ${volid} \
-     -o ${output} \
-     -J \
-     -joliet-long \
-     -cache-inodes  \
-     ${isoHybridMbr} \
-     -b isolinux/isolinux.bin \
-     -c isolinux/boot.cat \
-     -boot-load-size 4 \
-     -boot-info-table \
-     -no-emul-boot \
-     ${uefi_elToritoAltBoot} \
-     ${uefi_e} \
-     ${uefi_noEmulBoot} \
-     ${uefi_isohybridGptBasdat}
-     ${this.settings.work_dir.pathIso}`;
+         -r \
+         -checksum_algorithm_iso md5,sha1,sha256,sha512 \
+         -V ${volid} \
+         -o ${output} \
+         -J \
+         -joliet-long \
+         -cache-inodes  \
+         ${isoHybridMbr} \
+         -b isolinux/isolinux.bin \
+         -c isolinux/boot.cat \
+         -boot-load-size 4 \
+         -boot-info-table \
+         -no-emul-boot \
+         ${uefi_elToritoAltBoot} \
+         ${uefi_e} \
+         ${uefi_noEmulBoot} \
+         ${uefi_isohybridGptBasdat}
+         ${this.settings.work_dir.pathIso}`
+        */
         /**
          * how is made in refracta
          *
@@ -1429,7 +1432,7 @@ class Ovary {
         }
         utils_2.default.writeX(`${this.settings.work_dir.path}mkisofs`, cmd);
         if (!scriptOnly) {
-            await (0, utils_1.exec)(cmd, this.echo);
+            await (0, utils_1.exec)(cmd, utils_2.default.setEcho(true));
         }
     }
     /**

package/lib/classes/pacman.d.ts

@@ -6,7 +6,7 @@
  */
 import { IRemix, IDistro } from '../interfaces';
 /**
- * Utils: general porpourse utils
+ * Utils: general porpouse utils
  * @remarks all the utilities
  */
 export default class Pacman {

package/lib/classes/pacman.js

@@ -22,7 +22,7 @@ const suse_1 = (0, tslib_1.__importDefault)(require("./family/suse"));
 const config_file = '/etc/penguins-eggs.d/eggs.yaml';
 const config_tools = '/etc/penguins-eggs.d/tools.yaml';
 /**
- * Utils: general porpourse utils
+ * Utils: general porpouse utils
  * @remarks all the utilities
  */
 class Pacman {
@@ -447,8 +447,8 @@ class Pacman {
      * distroTemplateCheck
      */
     static distroTemplateCheck() {
-        const versionLike = this.distro().versionLike;
-        return node_fs_1.default.existsSync(`/etc/penguins-eggs.d/distros/${versionLike}`);
+        const codenameLikeId = this.distro().codenameLikeId;
+        return node_fs_1.default.existsSync(`/etc/penguins-eggs.d/distros/${codenameLikeId}`);
     }
     /**
      *
@@ -459,7 +459,7 @@ class Pacman {
         }
         const echo = utils_1.default.setEcho(verbose);
         const rootPen = utils_1.default.rootPenguin();
-        await (0, utils_2.exec)(`mkdir /etc/penguins-eggs.d/distros/${this.distro().versionLike}`);
+        await (0, utils_2.exec)(`mkdir /etc/penguins-eggs.d/distros/${this.distro().codenameLikeId}`);
         /**
          * Debian 10 - Buster: è il master per tutte le distro
          */
@@ -467,7 +467,7 @@ class Pacman {
         /**
          * Debian 8 jessie:  eredita grub, isolinux e locales da buster, contiene krill al posto di calamares
          */
-        if (this.distro().versionLike === 'jessie') {
+        if (this.distro().codenameLikeId === 'jessie') {
             const dest = '/etc/penguins-eggs.d/distros/jessie';
             await (0, utils_2.exec)(`cp -r ${buster}/locales ${dest}/locales`, echo);
             await (0, utils_2.exec)(`cp -r ${rootPen}/conf/distros/jessie/krill ${dest}/krill`, echo);
@@ -475,7 +475,7 @@ class Pacman {
              * Debian 9 stretch:  eredita grub, isolinux e locales da buster, contiene krill al posto di calamares
              */
         }
-        else if (this.distro().versionLike === 'stretch') {
+        else if (this.distro().codenameLikeId === 'stretch') {
             const dest = '/etc/penguins-eggs.d/distros/stretch';
             await (0, utils_2.exec)(`cp -r ${buster}/locales ${dest}/locales`, echo);
             await (0, utils_2.exec)(`cp -r ${rootPen}/conf/distros/jessie/krill ${dest}/krill`, echo);
@@ -483,7 +483,7 @@ class Pacman {
              * Debian 10 buster: eredita tutto da buster
              */
         }
-        else if (this.distro().versionLike === 'buster') {
+        else if (this.distro().codenameLikeId === 'buster') {
             const dest = '/etc/penguins-eggs.d/distros/buster';
             await (0, utils_2.exec)(`cp -r ${buster}/locales ${dest}/locales`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares ${dest}/calamares`, echo);
@@ -491,7 +491,7 @@ class Pacman {
              * Debian 11 bullseye: eredita tutto da buster
              */
         }
-        else if (this.distro().versionLike === 'bullseye') {
+        else if (this.distro().codenameLikeId === 'bullseye') {
             const dest = '/etc/penguins-eggs.d/distros/bullseye';
             await (0, utils_2.exec)(`cp -r ${buster}/locales ${dest}/locales`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares ${dest}/calamares`, echo);
@@ -499,7 +499,7 @@ class Pacman {
              * Debian 12 bookworm: eredita tutto da buster
              */
         }
-        else if (this.distro().versionLike === 'bookworm') {
+        else if (this.distro().codenameLikeId === 'bookworm') {
             const dest = '/etc/penguins-eggs.d/distros/bookworm';
             await (0, utils_2.exec)(`cp -r ${buster}/locales ${dest}/locales`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares ${dest}/calamares`, echo);
@@ -510,7 +510,7 @@ class Pacman {
              * Devuan beowulf: eredita tutto da buster
              */
         }
-        else if (this.distro().versionLike === 'beowulf') {
+        else if (this.distro().codenameLikeId === 'beowulf') {
             const dest = '/etc/penguins-eggs.d/distros/beowulf';
             await (0, utils_2.exec)(`cp -r ${buster}/locales ${dest}/locales`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares ${dest}/calamares`, echo);
@@ -518,7 +518,7 @@ class Pacman {
              * Devuan chimaera: eredita tutto da buster
              */
         }
-        else if (this.distro().versionLike === 'chimaera') {
+        else if (this.distro().codenameLikeId === 'chimaera') {
             const dest = '/etc/penguins-eggs.d/distros/chimaera';
             await (0, utils_2.exec)(`cp -r ${buster}/locales ${dest}/locales`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares ${dest}/calamares`, echo);
@@ -526,7 +526,7 @@ class Pacman {
              * Devuan daedalus: eredita tutto da buster
              */
         }
-        else if (this.distro().versionLike === 'daedalus') {
+        else if (this.distro().codenameLikeId === 'daedalus') {
             const dest = '/etc/penguins-eggs.d/distros/daedalus';
             await (0, utils_2.exec)(`cp -r ${buster}/locales ${dest}/locales`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares ${dest}/calamares`, echo);
@@ -537,7 +537,7 @@ class Pacman {
              * Ubuntu 10.04 bionic: eredita da bionic, focal grub ed isolinux, da buster i seguenti
              */
         }
-        else if (this.distro().versionLike === 'bionic') {
+        else if (this.distro().codenameLikeId === 'bionic') {
             const dest = '/etc/penguins-eggs.d/distros/bionic';
             const bionic = `${rootPen}/conf/distros/bionic/*`;
             await (0, utils_2.exec)(`cp -r ${bionic} ${dest}`, echo);
@@ -556,7 +556,7 @@ class Pacman {
              * Ubuntu focal: eredita da focal e buster
              */
         }
-        else if (this.distro().versionLike === 'focal') {
+        else if (this.distro().codenameLikeId === 'focal') {
             const dest = '/etc/penguins-eggs.d/distros/focal';
             const focal = `${rootPen}/conf/distros/focal/*`;
             await (0, utils_2.exec)(`cp -r ${focal} ${dest}`, echo);
@@ -571,7 +571,7 @@ class Pacman {
              * Ubuntu 20.10 groovy: eredita da focal e buster
              */
         }
-        else if (this.distro().versionLike === 'groovy') {
+        else if (this.distro().codenameLikeId === 'groovy') {
             const dest = '/etc/penguins-eggs.d/distros/groovy';
             const focal = `${rootPen}/conf/distros/focal/*`;
             await (0, utils_2.exec)(`cp -r ${focal} ${dest}`, echo);
@@ -586,7 +586,7 @@ class Pacman {
              * Ubuntu 21.04 hirsute: eredita da focal e buster
              */
         }
-        else if (this.distro().versionLike === 'hirsute') {
+        else if (this.distro().codenameLikeId === 'hirsute') {
             const dest = '/etc/penguins-eggs.d/distros/hirsute';
             const focal = `${rootPen}/conf/distros/focal/*`;
             await (0, utils_2.exec)(`cp -r ${focal} ${dest}`, echo);
@@ -601,7 +601,7 @@ class Pacman {
              * Ubuntu 21.10 impish: eredita da focal e buster
              */
         }
-        else if (this.distro().versionLike === 'impish') {
+        else if (this.distro().codenameLikeId === 'impish') {
             const dest = '/etc/penguins-eggs.d/distros/impish';
             const focal = `${rootPen}/conf/distros/focal/*`;
             await (0, utils_2.exec)(`cp -r ${focal} ${dest}`, echo);
@@ -616,7 +616,7 @@ class Pacman {
              * Ubuntu 22.04 jammy: eredita da focal e buster
              */
         }
-        else if (this.distro().versionLike === 'jammy') {
+        else if (this.distro().codenameLikeId === 'jammy') {
             const dest = '/etc/penguins-eggs.d/distros/jammy';
             const focal = `${rootPen}/conf/distros/focal/*`;
             await (0, utils_2.exec)(`cp -r ${focal} ${dest}`, echo);
@@ -634,7 +634,7 @@ class Pacman {
              * Fedora 35 ThirtyFive: eredita da ThirtyFive
              */
         }
-        else if (this.distro().versionLike === 'thirtyfive') {
+        else if (this.distro().codenameLikeId === 'thirtyfive') {
             const dest = '/etc/penguins-eggs.d/distros/thirtyfive/';
             const thirtytive = `${rootPen}/conf/distros/thirtyfive/*`;
             await (0, utils_2.exec)(`cp -r ${thirtytive} ${dest}`, echo);
@@ -645,7 +645,7 @@ class Pacman {
              * Endeavour rolling: eredita da rolling
              */
         }
-        else if (this.distro().versionLike === 'rolling') {
+        else if (this.distro().codenameLikeId === 'rolling') {
             const dest = '/etc/penguins-eggs.d/distros/rolling/';
             const rolling = `${rootPen}/conf/distros/rolling/*`;
             await (0, utils_2.exec)(`cp -r ${rolling} ${dest}`, echo);
@@ -656,7 +656,7 @@ class Pacman {
              * openSUSE tumbleweed: eredita da tumbleweed
              */
         }
-        else if (this.distro().versionLike === 'tumbleweed') {
+        else if (this.distro().codenameLikeId === 'tumbleweed') {
             const dest = '/etc/penguins-eggs.d/distros/tumbleweed/';
             const tumbleweed = `${rootPen}/conf/distros/tumbleweed/*`;
             await (0, utils_2.exec)(`cp -r ${tumbleweed} ${dest}`, echo);

package/lib/classes/pve-live.js

@@ -17,7 +17,7 @@ const tslib_1 = require("tslib");
  * This will remove the symbolic link that indicated that the service should be started automatically.
  */
 const systemctl_1 = (0, tslib_1.__importDefault)(require("./systemctl"));
-const node_path_1 = (0, tslib_1.__importDefault)(require("node:path"));
+const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const shelljs_1 = (0, tslib_1.__importDefault)(require("shelljs"));
 class PveLive {
     constructor() {
@@ -44,32 +44,28 @@ class PveLive {
      *
      */
     createScript(root = '/') {
-        shelljs_1.default.cp(node_path_1.default.resolve(__dirname, '../../scripts/pve-live.sh'), root + '/usr/bin/');
+        shelljs_1.default.cp(path_1.default.resolve(__dirname, '../../scripts/pve-live.sh'), root + '/usr/bin/');
     }
     /**
      *
      */
     createService(root = '/') {
-        shelljs_1.default.cp(node_path_1.default.resolve(__dirname, '../../scripts/pve-live.service'), root + '/lib/systemd/system/');
+        shelljs_1.default.cp(path_1.default.resolve(__dirname, '../../scripts/pve-live.service'), root + '/lib/systemd/system/');
     }
     /**
      *
      */
     start() {
-        this.systemctl.start('lxcfs');
-        this.systemctl.start('pve-cluster');
-        this.systemctl.start('pve-firewall');
+        this.systemctl.start('pve-live');
+        // this.systemctl.start('lxcfs')
+        // this.systemctl.start('pve-cluster')
+        // this.systemctl.start('pve-firewall')
         // this.systemctl.start('pve-guests')
-        this.systemctl.start('pve-ha-crm');
-        this.systemctl.start('pve-ha-lrm');
+        // this.systemctl.start('pve-ha-crm')
+        // this.systemctl.start('pve-ha-lrm')
     }
     stop() {
-        this.systemctl.stop('lxcfs');
-        this.systemctl.stop('pve-cluster');
-        this.systemctl.stop('pve-firewall');
-        // this.systemctl.stop('pve-guests')
-        this.systemctl.stop('pve-ha-crm');
-        this.systemctl.stop('pve-ha-lrm');
+        this.systemctl.start('pve-live');
     }
 }
 exports.default = PveLive;

package/lib/classes/utils.d.ts

@@ -12,9 +12,9 @@ export default class Utils {
     /**
      * Restituisce il prefisso della iso
      * @param distroId
-     * @param versionId
+     * @param codenameId
      */
-    static snapshotPrefix(distroId: string, versionId: string): string;
+    static snapshotPrefix(distroId: string, codenameId: string): string;
     /**
     * Controlla se il sistema è avviato con systemd
     * funziona anche in MX che utilizza systemd
@@ -28,7 +28,10 @@ export default class Utils {
     static isSysvinit(): boolean;
     /**
      * ricava path per vmlinuz
-     * BOOT_IMAGE=(hd0,msdos1)/vmlinuz-5.15.6-200.fc35.x86_64 root=UUID=91cf614e-62a1-464c-904f-38d0a1ceb7a7 ro rootflags=subvol=root rhgb quiet
+     * Normalmente cerca BOOT_IMAGE
+     * BOOT_IMAGE=/boot/vmlinuz-5.16.0-3-amd64 root=UUID=13768873-d6ba-4ae5-9e14-b5011f5aa31c ro quiet splash resume=UUID=beafb9b4-c429-4e1f-a268-4270b63a14e6
+     * se non è presente, come nel caso di Franco, cerca initrd e ricostruisce vmlinuz
+     * ro root=UUID=3dc0f202-8ac8-4686-9316-dddcec060c48 initrd=boot\initrd.img-5.15.0-0.bpo.3-amd64 // Conidi
      */
     static vmlinuz(): string;
     /**

package/lib/classes/utils.js

@@ -26,10 +26,10 @@ class Utils {
     /**
      * Restituisce il prefisso della iso
      * @param distroId
-     * @param versionId
+     * @param codenameId
      */
-    static snapshotPrefix(distroId, versionId) {
-        let result = 'egg-of-' + distroId.toLowerCase() + '-' + versionId.toLowerCase() + '-';
+    static snapshotPrefix(distroId, codenameId) {
+        let result = 'egg-of-' + distroId.toLowerCase() + '-' + codenameId.toLowerCase() + '-';
         result = result.replace(`/`, '-');
         return result;
     }
@@ -58,25 +58,43 @@ class Utils {
     }
     /**
      * ricava path per vmlinuz
-     * BOOT_IMAGE=(hd0,msdos1)/vmlinuz-5.15.6-200.fc35.x86_64 root=UUID=91cf614e-62a1-464c-904f-38d0a1ceb7a7 ro rootflags=subvol=root rhgb quiet
+     * Normalmente cerca BOOT_IMAGE
+     * BOOT_IMAGE=/boot/vmlinuz-5.16.0-3-amd64 root=UUID=13768873-d6ba-4ae5-9e14-b5011f5aa31c ro quiet splash resume=UUID=beafb9b4-c429-4e1f-a268-4270b63a14e6
+     * se non è presente, come nel caso di Franco, cerca initrd e ricostruisce vmlinuz
+     * ro root=UUID=3dc0f202-8ac8-4686-9316-dddcec060c48 initrd=boot\initrd.img-5.15.0-0.bpo.3-amd64 // Conidi
      */
     static vmlinuz() {
-        const cmdline = fs_1.default.readFileSync('/proc/cmdline', 'utf8');
-        // start = find BOOT_IMAGE 
-        const start = cmdline.search('BOOT_IMAGE=/') + 11;
-        // end first space after
-        const end = cmdline.substring(start).indexOf(' ');
-        let vmlinux = cmdline.substring(start, start + end);
-        // btrfs
-        if (vmlinux.indexOf('@') > 0) {
-            vmlinux = vmlinux.substring(vmlinux.indexOf(' ') + 1);
+        let vmlinuz = '';
+        // find vmlinuz in /proc/cmdline
+        const cmdline = fs_1.default.readFileSync('/proc/cmdline', 'utf8').split(" ");
+        cmdline.forEach(cmd => {
+            if (cmd.includes('BOOT_IMAGE')) {
+                vmlinuz = cmd.substring(cmd.indexOf('=') + 1);
+            }
+        });
+        // If vmlinuz not found in /proc/cmdline, try to find version in initrd.img
+        if (vmlinuz === '') {
+            cmdline.forEach(cmd => {
+                if (cmd.includes('initrd.img')) {
+                    vmlinuz = '/boot/vmlinuz' + cmd.substring(cmd.indexOf('initrd.img') + 10);
+                }
+            });
         }
-        if (!fs_1.default.existsSync(vmlinux)) {
-            if (fs_1.default.existsSync('/boot' + vmlinux)) {
-                vmlinux = '/boot' + vmlinux;
+        // if vmlinuz exist in /boot
+        if (!fs_1.default.existsSync(vmlinuz)) {
+            if (fs_1.default.existsSync('/boot' + vmlinuz)) {
+                vmlinuz = '/boot' + vmlinuz;
             }
         }
-        return vmlinux;
+        // if vmlinux don't exist
+        if (!fs_1.default.existsSync(vmlinuz)) {
+            vmlinuz = '/path/to/vmlinuz';
+        }
+        // btrfs
+        if (vmlinuz.indexOf('@') > 0) {
+            vmlinuz = vmlinuz.substring(vmlinuz.indexOf(' ') + 1);
+        }
+        return vmlinuz;
     }
     /**
      * ricava path per initrdImg