penguins-eggs 9.6.21 → 9.6.23

package/dist/classes/ovary.js

@@ -54,6 +54,9 @@ class Ovary {
         this.cryptedclone = false;
         this.cliAutologin = new cli_autologin_1.default();
         this.ovarium = '';
+        /**
+         * END CLASS ovary
+         */
     }
     /**
      * @returns {boolean} success
@@ -86,10 +89,19 @@ class Ovary {
         return false;
     }
     /**
-     *
-     * @param basename
+     * produce
+     * @param clone
+     * @param cryptedclone
+     * @param scriptOnly
+     * @param yolkRenew
+     * @param release
+     * @param myAddons
+     * @param nointeractive
+     * @param noicons
+     * @param unsecure
+     * @param verbose
      */
-    async produce(clone = false, cryptedclone = false, scriptOnly = false, yolkRenew = false, release = false, myAddons, nointeractive = false, noicons = false, unsecure = false, verbose = false) {
+    async produce(clone = false, cryptedclone = false, scriptOnly = false, yolkRenew = false, release = false, myAddons, filters, nointeractive = false, noicons = false, unsecure = false, verbose = false) {
         this.verbose = verbose;
         this.echo = utils_2.default.setEcho(verbose);
         if (this.verbose) {
@@ -104,16 +116,16 @@ class Ovary {
         if (this.familyId === 'debian' && utils_2.default.uefiArch() === 'amd64') {
             const yolk = new yolk_1.default();
             if (!yolk.exists()) {
-                utils_2.default.warning('Create yolk');
+                utils_2.default.warning('creating yolk');
                 await yolk.create(verbose);
             }
             else if (yolkRenew) {
-                utils_2.default.warning('Renew yolk');
+                utils_2.default.warning('refreshing yolk');
                 await yolk.erase();
                 await yolk.create(verbose);
             }
             else {
-                utils_2.default.warning('Using preesixent yolk');
+                utils_2.default.warning('using preesixent yolk');
             }
         }
         if (!fs_1.default.existsSync(this.settings.config.snapshot_dir)) {
@@ -135,7 +147,9 @@ class Ovary {
                     await bleach.clean(verbose);
                 }
             }
-            // CRYPTEDCLONE
+            /**
+             * cryptedclone
+             */
             if (cryptedclone) {
                 console.log('eggs will SAVE users and users\' data ENCRYPTED on LUKS volume within the live');
                 const users = await this.usersFill();
@@ -151,21 +165,59 @@ class Ovary {
                         }
                     }
                 }
-                // CLONE
+                /**
+                 * clone
+                 *
+                 * users tend to set user_opt as
+                 * real user when create a clone,
+                 * this is WRONG here we correct
+                 */
             }
             else if (this.clone) {
-                // Patch for humans users used to
-                // set user_opt as real user when
-                // create a clone
-                this.settings.config.user_opt = 'live';
+                this.settings.config.user_opt = 'live'; // patch for humans 
                 this.settings.config.user_opt_passwd = 'evolution';
                 this.settings.config.root_passwd = 'evolution';
                 utils_2.default.warning('eggs will SAVE users and users\' data UNCRYPTED on the live');
-                // NORMAL
+                /**
+                 * normal
+                 */
             }
             else {
                 utils_2.default.warning('eggs will REMOVE users and users\' data from live');
             }
+            /**
+             * exclude.list
+             */
+            let excludeListTemplateDir = '/etc/penguins-eggs.d/exclude.list.d/';
+            let excludeListTemplate = excludeListTemplateDir + 'exclude.list.template';
+            if (!fs_1.default.existsSync(excludeListTemplate)) {
+                utils_2.default.warning('Cannot find: ' + excludeListTemplate);
+                process.exit(1);
+            }
+            let excludeCustom = '';
+            let excludeDev = '';
+            let excludeHomes = '';
+            let excludeUsr = '';
+            if (filters.custom) {
+                excludeCustom = fs_1.default.readFileSync(`${excludeListTemplateDir}exclude.list.custom`, 'utf8');
+            }
+            if (filters.dev) {
+                excludeDev = `home/${await utils_2.default.getPrimaryUser()}/*`;
+            }
+            if (filters.homes) {
+                excludeHomes = fs_1.default.readFileSync(`${excludeListTemplateDir}exclude.list.homes`, 'utf8');
+            }
+            if (filters.usr) {
+                excludeUsr = fs_1.default.readFileSync(`${excludeListTemplateDir}exclude.list.usr`, 'utf8');
+            }
+            let view = {
+                exclude_list_custom: excludeCustom,
+                exclude_list_dev: excludeDev,
+                exclude_list_homes: excludeHomes,
+                exclude_list_usr: excludeUsr
+            };
+            const template = fs_1.default.readFileSync(excludeListTemplate, 'utf8');
+            fs_1.default.writeFileSync(this.settings.config.snapshot_excludes, mustache_1.default.render(template, view));
             /**
              * NOTE: reCreate = false
              *
@@ -188,10 +240,10 @@ class Ovary {
                  * initrd for different familis
                  */
                 if (this.familyId === 'debian') {
-                    await this.initrdCopy();
+                    await this.initrdDebian();
                 }
                 else if (this.familyId === 'archlinux') {
-                    await this.initrdCreate();
+                    await this.initrdArch();
                 }
                 if (this.settings.config.make_efi) {
                     await this.makeEfi(this.theme);
@@ -241,10 +293,11 @@ class Ovary {
                 let uname = (await (0, utils_1.exec)('uname -r', { capture: true })).data;
                 uname = uname.replaceAll('\n', '');
                 let content = '';
+                content = '#!/usr/bin/env bash';
                 content += 'mkdir /live/bin -p\n';
                 content += '## \n';
-                content += 'cp /usr/lib/penguins-eggs/scripts/non-live-cmdline /live/bin -p\n';
-                content += 'chmod +x /live/bin/non-live-cmdline\n';
+                content += '# cp /usr/lib/penguins-eggs/scripts/non-live-cmdline /live/bin -p\n';
+                content += '# chmod +x /live/bin/non-live-cmdline\n';
                 content += '## \n';
                 content += 'mkdir /live/boot-dev/antiX -p\n';
                 content += 'ln -s /run/live/medium/live/filesystem.squashfs /live/boot-dev/antiX/linuxfs\n';
@@ -274,7 +327,6 @@ class Ovary {
                     hashExt = '.md5';
                 }
                 await (0, utils_1.exec)(`mkdir ${this.settings.iso_work}${pathName}/x86_64 -p`, this.echo);
-                // await exec(`ln -s ${this.settings.iso_work}live/filesystem.squashfs ${this.settings.iso_work}${pathName}.sfs`, this.echo)        
                 await (0, utils_1.exec)(`mv ${this.settings.iso_work}live/filesystem.squashfs ${this.settings.iso_work}${pathName}.sfs`, this.echo);
                 await (0, utils_1.exec)(`${hashCmd} ${this.settings.iso_work}${pathName}.sfs > ${this.settings.iso_work}${pathName}${hashExt}`, this.echo);
             }
@@ -288,7 +340,7 @@ class Ovary {
         if (this.verbose) {
             console.log('Ovary: liveCreateStructure');
         }
-        utils_2.default.warning(`Creating egg in ${this.settings.config.snapshot_dir}`);
+        utils_2.default.warning(`creating egg in ${this.settings.config.snapshot_dir}`);
         let cmd;
         if (!fs_1.default.existsSync(this.settings.config.snapshot_dir)) {
             cmd = `mkdir -p ${this.settings.config.snapshot_dir}`;
@@ -442,7 +494,6 @@ class Ovary {
          */
         if (fs_1.default.existsSync(`${this.settings.work_dir.merged}/etc/crypttab`)) {
             await (0, utils_1.exec)(`rm ${this.settings.work_dir.merged}/etc/crypttab`, this.echo);
-            // await exec(`touch ${this.settings.work_dir.merged}/etc/crypttab`, echo)
         }
         /**
          * Blank out systemd machine id.
@@ -575,12 +626,14 @@ class Ovary {
                 await (0, utils_1.exec)(`chmod 1777 ${this.settings.work_dir.merged}/dev/shm`, this.echo);
             }
             /**
-             * Assegno 1777 a /tmp
-             * creava problemi con MXLINUX
+             * creo /tmp
              */
             if (!fs_1.default.existsSync(`${this.settings.work_dir.merged}/tmp`)) {
                 await (0, utils_1.exec)(`mkdir ${this.settings.work_dir.merged}/tmp`, this.echo);
             }
+            /**
+            * Assegno 1777 a /tmp creava problemi con MXLINUX
+            */
             await (0, utils_1.exec)(`chmod 1777 ${this.settings.work_dir.merged}/tmp`, this.echo);
         }
     }
@@ -690,12 +743,10 @@ class Ovary {
         return kp;
     }
     /**
-     * copy kernel
+     * kernelCopy
      */
     async kernelCopy() {
-        if (this.verbose) {
-            console.log('Ovary: kernelCopy');
-        }
+        utils_2.default.warning(`copying ${node_path_1.default.basename(this.settings.kernel_image)} on ISO/live`);
         let lackVmlinuzImage = false;
         if (fs_1.default.existsSync(this.settings.kernel_image)) {
             await (0, utils_1.exec)(`cp ${this.settings.kernel_image} ${this.settings.iso_work}live/`, this.echo);
@@ -711,12 +762,11 @@ class Ovary {
         }
     }
     /**
+     * initrdArch()
      * necessita di echoYes
      */
-    async initrdCreate() {
-        if (this.verbose) {
-            console.log('Ovary: initrdCreate');
-        }
+    async initrdArch() {
+        utils_2.default.warning(`creating ${node_path_1.default.basename(this.settings.initrdImg)} on ISO/live`);
         let initrdImg = utils_2.default.initrdImg();
         initrdImg = initrdImg.slice(Math.max(0, initrdImg.lastIndexOf('/') + 1));
         utils_2.default.warning(`Creating ${initrdImg} in ${this.settings.iso_work}live/`);
@@ -732,12 +782,9 @@ class Ovary {
      * We must upgrade to initrdCreate for Debian/Ubuntu
      * @returns
      */
-    async initrdCopy(verbose = false) {
-        if (this.verbose) {
-            console.log('Ovary: initrdCopy');
-        }
+    async initrdDebian(verbose = false) {
+        utils_2.default.warning(`creating ${node_path_1.default.basename(this.settings.initrdImg)} on ISO/live`);
         let isCrypted = false;
-        utils_2.default.warning('initrdCreate');
         if (fs_1.default.existsSync('/etc/crypttab')) {
             isCrypted = true;
             await (0, utils_1.exec)('mv /etc/crypttab /etc/crypttab.saved', this.echo);
@@ -746,26 +793,6 @@ class Ovary {
         if (isCrypted) {
             await (0, utils_1.exec)('mv /etc/crypttab.saved /etc/crypttab', this.echo);
         }
-        /*
-      
-        Utils.warning(`initrdCopy`)
-        if (this.verbose) {
-          console.log('ovary: initrdCopy')
-        }
-        let lackInitrdImage = false
-        if (fs.existsSync(this.settings.initrd_image)) {
-          await exec(`cp ${this.settings.initrd_image} ${this.settings.iso_work}/live/`, this.echo)
-        } else {
-          Utils.error(`Cannot find ${this.settings.initrdImg}`)
-          lackInitrdImage = true
-        }
-      
-        if (lackInitrdImage) {
-          Utils.warning('Try to edit /etc/penguins-eggs.d/eggs.yaml and check for')
-          Utils.warning(`initrd_img: ${this.settings.initrd_image}`)
-          process.exit(1)
-        }
-        */
     }
     /**
      * squashFs: crea in live filesystem.squashfs
@@ -806,7 +833,6 @@ class Ovary {
          * secure
          */
         if (!unsecure) {
-            this.addRemoveExclusion(true, `home/*/*`);
             this.addRemoveExclusion(true, `root/*`);
             this.addRemoveExclusion(true, `root/.*`);
         }
@@ -825,14 +851,20 @@ class Ovary {
         if (utils_2.default.uefiArch() === 'arm64') {
             // limit = ' -processors 2 -mem 1024M'
         }
-        // SYNTAX: mksquashfs source1 source2 ...  
-        // FILESYSTEM [OPTIONS] 
-        // [-e list of exclude dirs/files]
+        /**
+         * mksquashfs
+         *
+         * SYNTAX: mksquashfs source1 source2 ...
+         * FILESYSTEM [OPTIONS]
+         * [-ef exclude.list]
+         * [-e list of exclude dirs/files]
+         */
         let cmd = `mksquashfs ${this.settings.work_dir.merged} ${this.settings.iso_work}live/filesystem.squashfs ${compression} ${limit} -wildcards -ef ${this.settings.config.snapshot_excludes} ${this.settings.session_excludes}`;
         cmd = cmd.replace(/\s\s+/g, ' ');
         utils_2.default.writeX(`${this.settings.work_dir.ovarium}mksquashfs`, cmd);
         if (!scriptOnly) {
-            utils_2.default.warning('squashing filesystem: ' + compression);
+            utils_2.default.warning('creating filesystem.squashfs on ISO/live');
+            // Utils.warning(`compression: ` + compression)
             const test = (await (0, utils_1.exec)(cmd, utils_2.default.setEcho(true))).code;
             if (test !== 0) {
                 process.exit();
@@ -855,7 +887,8 @@ class Ovary {
         if (this.verbose) {
             console.log('Ovary: mergedAndOverlay');
         }
-        const mountDirs = ['boot', 'etc', 'usr', 'var'];
+        // boot viene copiato... non ricordo perchè
+        const mountDirs = ['etc', 'usr', 'var'];
         let mountDir = '';
         let overlay = false;
         for (mountDir of mountDirs) {
@@ -885,7 +918,7 @@ class Ovary {
         }
         else {
             const noMergeDirs = [
-                'boot',
+                'boot', // will be copied now
                 'cdrom',
                 'dev',
                 'media',
@@ -999,6 +1032,8 @@ class Ovary {
     }
     /**
      * copyBoot
+     *
+     * necessario: prima era merged
      */
     async copyBoot() {
         if (this.verbose) {
@@ -1362,7 +1397,7 @@ class Ovary {
         if (fs_1.default.existsSync(memdiskDir)) {
             await (0, utils_1.exec)(`rm ${memdiskDir} -rf`, this.echo);
         }
-        utils_2.default.warning('creating memdiskDir: ' + memdiskDir);
+        utils_2.default.warning('creating temporary memdiskDir on ' + memdiskDir);
         await (0, utils_1.exec)(`mkdir ${memdiskDir}`);
         await (0, utils_1.exec)(`mkdir ${memdiskDir}/boot`, this.echo);
         await (0, utils_1.exec)(`mkdir ${memdiskDir}/boot/grub`, this.echo);
@@ -1382,7 +1417,7 @@ class Ovary {
         if (fs_1.default.existsSync(efiWorkDir)) {
             await (0, utils_1.exec)(`rm ${efiWorkDir} -rf`, this.echo);
         }
-        utils_2.default.warning('creating efiWordDir: ' + efiWorkDir);
+        utils_2.default.warning('creating temporary efiWordDir on ' + efiWorkDir);
         await (0, utils_1.exec)(`mkdir ${efiWorkDir}`, this.echo);
         await (0, utils_1.exec)(`mkdir ${efiWorkDir}boot`, this.echo);
         await (0, utils_1.exec)(`mkdir ${efiWorkDir}boot/grub`, this.echo);
@@ -1561,9 +1596,6 @@ class Ovary {
         }
         const volid = utils_2.default.getVolid(this.settings.remix.name);
         let prefix = this.settings.config.snapshot_prefix;
-        if (prefix.endsWith('rolling-')) {
-            prefix = prefix.substring(0, prefix.indexOf('rolling-'));
-        }
         let typology = '';
         // typology is applied only with standard egg-of
         if (prefix.slice(0, 7) === 'egg-of_') {
@@ -1595,7 +1627,7 @@ class Ovary {
                 utils_2.default.warning(`Can't create isohybrid image. File: ${isolinuxFile} not found. \nThe resulting image will be a standard iso file`);
             }
         }
-        // uefi_opt="-eltorito-alt-boot -e boot/grub/efiboot.img -isohybrid-gpt-basdat -no-emul-boot"
+        // uefi_opt="-uefi_elToritoAltBoot-alt-boot -e boot/grub/efiboot.img -isohybrid-gpt-basdat -no-emul-boot"
         let uefi_elToritoAltBoot = '';
         let uefi_e = '';
         let uefi_isohybridGptBasdat = '';
@@ -1636,7 +1668,7 @@ class Ovary {
           * -boot-load-size 4
           * -boot-info-table
           * -no-emul-boot
-          * -eltorito-alt-boot
+          * -uefi_elToritoAltBoot-alt-boot
           * -e boot/grub/efi.img
           * -no-emul-boot
           * -isohybrid-gpt-basdat
@@ -1657,7 +1689,7 @@ class Ovary {
          -boot-load-size 4 \
          -boot-info-table \
          -no-emul-boot \
-         ${uefi_elToritoAltBoot} \
+         ${uefi_eltoritoAltBoot} \
          ${uefi_e} \
          ${uefi_noEmulBoot} \
          ${uefi_isohybridGptBasdat}
@@ -1725,9 +1757,11 @@ class Ovary {
             const dest = this.settings.config.snapshot_dir + this.settings.isoFilename;
             await (0, utils_1.exec)(`ln -s ${src} ${dest}`);
             // Create md5sum, sha256sum
-            utils_2.default.warning('creating md5, sha256');
-            await (0, utils_1.exec)(`md5sum ${src} > ${dest.replace('.iso', '.md5')}`);
-            await (0, utils_1.exec)(`sha256sum ${src} > ${dest.replace('.iso', '.sha256')}`);
+            if (this.settings.config.make_md5sum) {
+                utils_2.default.warning('creating md5, sha256');
+                await (0, utils_1.exec)(`md5sum ${src} > ${dest.replace('.iso', '.md5')}`);
+                await (0, utils_1.exec)(`sha256sum ${src} > ${dest.replace('.iso', '.sha256')}`);
+            }
         }
     }
     /**
@@ -1777,6 +1811,9 @@ class Ovary {
     }
 }
 exports.default = Ovary;
+/**
+ * FUNCTIONS
+ */
 /**
  * Crea il path se non esiste
  * @param path
@@ -1820,17 +1857,4 @@ function isArchiso(distro) {
         found = true;
     }
     return found;
-    // EXCLUDED
-    let file = node_path_1.default.resolve(__dirname, '../../conf/archiso.yaml');
-    if (fs_1.default.existsSync('/etc/penguins-eggs.d/archiso.yaml')) {
-        file = '/etc/penguins-eggs.d/archiso.yaml';
-    }
-    const content = fs_1.default.readFileSync(file, 'utf8');
-    const distros = js_yaml_1.default.load(content);
-    for (const current of distros) {
-        if (current === distro) {
-            found = true;
-        }
-    }
-    return found;
 }

package/dist/classes/pacman.js

@@ -16,10 +16,10 @@ const distro_1 = tslib_1.__importDefault(require("./distro"));
 const settings_1 = tslib_1.__importDefault(require("./settings"));
 const node_child_process_1 = require("node:child_process");
 const utils_2 = require("../lib/utils");
-const debian_1 = tslib_1.__importDefault(require("./family/debian"));
-const fedora_1 = tslib_1.__importDefault(require("./family/fedora"));
-const archlinux_1 = tslib_1.__importDefault(require("./family/archlinux"));
-const suse_1 = tslib_1.__importDefault(require("./family/suse"));
+const debian_1 = tslib_1.__importDefault(require("./families/debian"));
+const fedora_1 = tslib_1.__importDefault(require("./families/fedora"));
+const archlinux_1 = tslib_1.__importDefault(require("./families/archlinux"));
+const suse_1 = tslib_1.__importDefault(require("./families/suse"));
 const config_file = '/etc/penguins-eggs.d/eggs.yaml';
 const config_tools = '/etc/penguins-eggs.d/tools.yaml';
 /**
@@ -40,6 +40,10 @@ class Pacman {
         const distro = new distro_1.default(remix);
         return distro;
     }
+    /**
+     *
+     * @returns grub
+     */
     static whichGrubIsInstalled() {
         let grubInstalled = '';
         if (this.distro().familyId === 'debian') {
@@ -64,27 +68,29 @@ class Pacman {
     }
     /**
      * check if it's installed xorg
-     * @returns true if xorg is installed
+     * @returns
      */
     static isInstalledXorg() {
         let installed = false;
         if (this.distro().familyId === 'debian') {
-            if (debian_1.default.isInstalledXorg()) {
+            if (debian_1.default.packageIsInstalled('xserver-xorg-core')) {
                 installed = true;
             }
         }
         else if (this.distro().familyId === 'fedora') {
-            if (fedora_1.default.isInstalledXorg()) {
+            if (fedora_1.default.packageIsInstalled('xorg-x11-server-Xorg.x86_64')) {
                 installed = true;
             }
         }
         else if (this.distro().familyId === 'archlinux') {
-            if (archlinux_1.default.isInstalledXorg()) {
+            if (archlinux_1.default.packageIsInstalled('xorg-server-common')) {
                 installed = true;
             }
         }
-        else if (this.distro().familyId === 'suse' && suse_1.default.isInstalledXorg()) {
-            installed = true;
+        else if (this.distro().familyId === 'suse') {
+            if (suse_1.default.packageIsInstalled('xorg-x11-server')) {
+                installed = true;
+            }
         }
         return installed;
     }
@@ -95,22 +101,24 @@ class Pacman {
     static isInstalledWayland() {
         let installed = false;
         if (this.distro().familyId === 'debian') {
-            if (debian_1.default.isInstalledWayland()) {
+            if (debian_1.default.packageIsInstalled('xwayland')) {
                 installed = true;
             }
         }
         else if (this.distro().familyId === 'fedora') {
-            if (fedora_1.default.isInstalledWayland()) {
+            if (fedora_1.default.packageIsInstalled('xorg-x11-server-Xwayland*')) {
                 installed = true;
             }
         }
         else if (this.distro().familyId === 'archlinux') {
-            if (archlinux_1.default.isInstalledWayland()) {
+            if (archlinux_1.default.packageIsInstalled('xwayland')) {
                 installed = true;
             }
         }
-        else if (this.distro().familyId === 'suse' && suse_1.default.isInstalledWayland()) {
-            installed = true;
+        else if (this.distro().familyId === 'suse') {
+            if (suse_1.default.packageIsInstalled('xwayland*')) {
+                installed = true;
+            }
         }
         return installed;
     }
@@ -121,8 +129,10 @@ class Pacman {
     static isUefi() {
         let isUefi = false;
         if (this.distro().familyId === 'debian') {
-            if (utils_1.default.uefiArch() !== 'i386' && this.packageIsInstalled('grub-efi-' + utils_1.default.uefiArch() + '-bin')) {
-                isUefi = true;
+            if (utils_1.default.uefiArch() !== 'i386') {
+                if (this.packageIsInstalled('grub-efi-' + utils_1.default.uefiArch() + '-bin')) {
+                    isUefi = true;
+                }
             }
         }
         else if (Pacman.distro().familyId === 'fedora') {
@@ -169,21 +179,23 @@ class Pacman {
     }
     /**
      * Crea array packages dei pacchetti da installare
+     *
+     * probabilmente non usata
+     *
      */
     static packages(remove = false, verbose = false) {
         let packages = [];
+        /*
         if (this.distro().familyId === 'debian') {
-            packages = []; // Debian.packages(remove, verbose)
-        }
-        else if (this.distro().familyId === 'fedora') {
-            packages = []; // Fedora.packages(remove, verbose)
-        }
-        else if (this.distro().familyId === 'archlinux') {
-            packages = []; // Archlinux.packages(remove, verbose)
-        }
-        else if (this.distro().familyId === 'suse') {
-            packages = []; // packages = Suse.packages(remove, verbose)
-        }
+          packages = Debian.packages(remove, verbose)
+        } else if (this.distro().familyId === 'fedora') {
+          packages = Fedora.packages(remove, verbose)
+        } else if (this.distro().familyId === 'archlinux') {
+          packages = Archlinux.packages(remove, verbose)
+        } else if (this.distro().familyId === 'suse') {
+          packages = Suse.packages(remove, verbose)
+        }
+        */
         return packages;
     }
     /**
@@ -308,8 +320,7 @@ class Pacman {
      */
     static configurationCheck() {
         const confExists = node_fs_1.default.existsSync(config_file);
-        const listExists = node_fs_1.default.existsSync('/usr/local/share/penguins-eggs/exclude.list');
-        return confExists && listExists;
+        return confExists;
     }
     /**
      * Ritorna vero se machine-id è uguale
@@ -331,7 +342,7 @@ class Pacman {
         config.version = utils_1.default.getPackageVersion();
         config.snapshot_dir = '/home/eggs';
         config.snapshot_prefix = '';
-        config.snapshot_excludes = '/usr/local/share/penguins-eggs/exclude.list';
+        config.snapshot_excludes = '/etc/penguins-eggs.d/exclude.list';
         config.snapshot_basename = ''; // before default was hostname
         config.user_opt = 'live';
         config.user_opt_passwd = 'evolution';
@@ -397,15 +408,17 @@ class Pacman {
         shelljs_1.default.cp(node_path_1.default.resolve(__dirname, '../../conf/tools.yaml'), config_tools);
         shelljs_1.default.cp(node_path_1.default.resolve(__dirname, '../../conf/krill.yaml'), confRoot);
         shelljs_1.default.cp(node_path_1.default.resolve(__dirname, '../../conf/derivatives.yaml'), confRoot);
-        // shx.cp(path.resolve(__dirname, '../../conf/archiso.yaml'), confRoot)
         // init
         shelljs_1.default.cp(node_path_1.default.resolve(__dirname, '../../conf/init/unattended.sh'), '/etc/penguins-eggs.d/init');
         shelljs_1.default.chmod('+x', '/etc/penguins-eggs.d/init/unattended.sh');
         shelljs_1.default.cp(node_path_1.default.resolve(__dirname, '../../conf/init/cuckoo.sh'), '/etc/penguins-eggs.d/init');
         shelljs_1.default.chmod('+x', '/etc/penguins-eggs.d/init/cuckoo.sh');
-        // creazione del file delle esclusioni
-        shelljs_1.default.mkdir('-p', '/usr/local/share/penguins-eggs/');
-        shelljs_1.default.cp(node_path_1.default.resolve(__dirname, '../../conf/exclude.list'), '/usr/local/share/penguins-eggs');
+        // creazione cartella exclude.list.d
+        (0, node_child_process_1.execSync)(`mkdir -p /etc/penguins-eggs.d/exclude.list.d`);
+        shelljs_1.default.cp(node_path_1.default.resolve(__dirname, '../../conf/exclude.list.template'), '/etc/penguins-eggs.d/exclude.list.d');
+        shelljs_1.default.cp(node_path_1.default.resolve(__dirname, '../../conf/exclude.list.custom'), '/etc/penguins-eggs.d/exclude.list.d');
+        shelljs_1.default.cp(node_path_1.default.resolve(__dirname, '../../conf/exclude.list.homes'), '/etc/penguins-eggs.d/exclude.list.d');
+        shelljs_1.default.cp(node_path_1.default.resolve(__dirname, '../../conf/exclude.list.usr'), '/etc/penguins-eggs.d/exclude.list.d');
         await this.configurationFresh();
     }
     /**
@@ -416,9 +429,6 @@ class Pacman {
         if (node_fs_1.default.existsSync('/etc/penguins-eggs.d')) {
             await (0, utils_2.exec)('rm /etc/penguins-eggs.d -rf', echo);
         }
-        if (node_fs_1.default.existsSync('/usr/local/share/penguins-eggs/exclude.list')) {
-            await (0, utils_2.exec)('rm /usr/local/share/penguins-eggs/exclude.list', echo);
-        }
         if (node_fs_1.default.existsSync('/etc/calamares')) {
             await (0, utils_2.exec)('rm /etc/calamares -rf', echo);
         }

package/dist/classes/tools.js

@@ -48,9 +48,6 @@ class Tools {
             settings.load();
             this.snapshot_dir = settings.config.snapshot_dir;
             let prefix = settings.config.snapshot_prefix;
-            if (prefix.endsWith('rolling-')) {
-                prefix = prefix.substring(0, prefix.indexOf('rolling-'));
-            }
             this.snapshot_name = prefix + settings.config.snapshot_basename + '_' + utils_1.default.uefiArch();
         }
         else {

package/dist/classes/utils.js

@@ -51,7 +51,13 @@ class Utils {
      * @param codenameId
      */
     static snapshotPrefix(distroId, codenameId) {
-        let result = 'egg-of_' + distroId.toLowerCase() + '-' + codenameId.toLowerCase() + '-';
+        let result = '';
+        if (codenameId === 'rolling' || codenameId === '') {
+            result = 'egg-of_' + distroId.toLowerCase() + '-';
+        }
+        else {
+            result = 'egg-of_' + distroId.toLowerCase() + '-' + codenameId.toLowerCase() + '-';
+        }
         result = result.replace(`/`, '-');
         return result;
     }
@@ -93,6 +99,9 @@ class Utils {
         cmdline.forEach(cmd => {
             if (cmd.includes('BOOT_IMAGE')) {
                 vmlinuz = cmd.substring(cmd.indexOf('=') + 1);
+                if (!fs_1.default.existsSync(vmlinuz) && fs_1.default.existsSync(`/boot${vmlinuz}`)) {
+                    vmlinuz = `/boot${vmlinuz}`;
+                }
             }
         });
         // btrfs
@@ -523,10 +532,10 @@ class Utils {
     static isLive() {
         let retVal = false;
         const paths = [
-            '/lib/live/mount',
-            '/lib/live/mount/rootfs/filesystem.squashfs',
-            '/live/aufs',
-            '/run/miso/sfs/livefs',
+            '/lib/live/mount', // debian-live
+            '/lib/live/mount/rootfs/filesystem.squashfs', // ubuntu bionic
+            '/live/aufs', // mx-linux
+            '/run/miso/sfs/livefs', // ManjaroLinux
             '/run/archiso/airootfs' // Arch
         ];
         for (let i = 0; i < paths.length; i++) {