penguins-eggs 9.0.25 → 9.0.48

package/lib/classes/ovary.js

@@ -11,83 +11,68 @@ const tslib_1 = require("tslib");
  */
 // packages
 const fs = require("fs");
-const node_path_1 = (0, tslib_1.__importDefault)(require("node:path"));
-const node_os_1 = (0, tslib_1.__importDefault)(require("node:os"));
-const shelljs_1 = (0, tslib_1.__importDefault)(require("shelljs"));
-const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
-const mustache_1 = (0, tslib_1.__importDefault)(require("mustache"));
-const pve_live_1 = (0, tslib_1.__importDefault)(require("./pve-live"));
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
+const node_os_1 = tslib_1.__importDefault(require("node:os"));
+const shelljs_1 = tslib_1.__importDefault(require("shelljs"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const mustache_1 = tslib_1.__importDefault(require("mustache"));
+const pve_live_1 = tslib_1.__importDefault(require("./pve-live"));
 // libraries
 const utils_1 = require("../lib/utils");
 // classes
-const utils_2 = (0, tslib_1.__importDefault)(require("./utils"));
-const n8_1 = (0, tslib_1.__importDefault)(require("./n8"));
-const incubator_1 = (0, tslib_1.__importDefault)(require("./incubation/incubator"));
-const xdg_1 = (0, tslib_1.__importDefault)(require("./xdg"));
-const pacman_1 = (0, tslib_1.__importDefault)(require("./pacman"));
-const settings_1 = (0, tslib_1.__importDefault)(require("./settings"));
-const systemctl_1 = (0, tslib_1.__importDefault)(require("./systemctl"));
-const bleach_1 = (0, tslib_1.__importDefault)(require("./bleach"));
-const yolk_1 = (0, tslib_1.__importDefault)(require("./yolk"));
+const utils_2 = tslib_1.__importDefault(require("./utils"));
+const n8_1 = tslib_1.__importDefault(require("./n8"));
+const incubator_1 = tslib_1.__importDefault(require("./incubation/incubator"));
+const xdg_1 = tslib_1.__importDefault(require("./xdg"));
+const pacman_1 = tslib_1.__importDefault(require("./pacman"));
+const settings_1 = tslib_1.__importDefault(require("./settings"));
+const systemctl_1 = tslib_1.__importDefault(require("./systemctl"));
+const bleach_1 = tslib_1.__importDefault(require("./bleach"));
+const yolk_1 = tslib_1.__importDefault(require("./yolk"));
 const cliAutologin = require("../lib/cli-autologin");
 const displaymanager_1 = require("./incubation/fisherman-helper/displaymanager");
 // backup
 const promises_1 = require("fs/promises");
 const fs_1 = require("fs");
-const users_1 = (0, tslib_1.__importDefault)(require("./users"));
+const users_1 = tslib_1.__importDefault(require("./users"));
 /**
  * Ovary:
  */
 class Ovary {
-    /**
-     * Egg
-     * @param compression
-     */
-    constructor(snapshot_prefix = '', snapshot_basename = '', theme = '', compression = '') {
-        this.toNull = ' > /dev/null 2>&1';
+    constructor() {
+        this.verbose = false;
+        this.echo = {};
+        this.toNull = '';
         this.incubator = {};
         this.settings = {};
         this.familyId = '';
         this.snapshot_prefix = '';
         this.snapshot_basename = '';
-        this.theme = '';
         this.compression = '';
-        this.settings = new settings_1.default();
-        // I flags di produce hanno la preferenza
-        if (snapshot_prefix !== '') {
-            this.snapshot_prefix = snapshot_prefix;
-        }
-        if (snapshot_basename !== '') {
-            this.snapshot_basename = snapshot_basename;
-        }
-        if (theme !== '') {
-            this.theme = theme;
-        }
-        if (compression !== '') {
-            this.compression = compression;
-        }
     }
     /**
      * @returns {boolean} success
      */
-    async fertilization() {
+    async fertilization(snapshot_prefix = '', snapshot_basename = '', theme = '', compression = '') {
+        this.settings = new settings_1.default();
         if (await this.settings.load()) {
             this.familyId = this.settings.distro.familyId;
-            if (this.snapshot_prefix !== '') {
-                this.settings.config.snapshot_prefix = this.snapshot_prefix;
+            if (snapshot_prefix !== '') {
+                this.settings.config.snapshot_prefix = snapshot_prefix;
             }
-            if (this.snapshot_basename !== '') {
-                this.settings.config.snapshot_basename = this.snapshot_basename;
+            if (snapshot_basename !== '') {
+                this.settings.config.snapshot_basename = snapshot_basename;
             }
-            if (this.theme !== '') {
-                this.settings.config.theme = this.theme;
+            if (theme !== '') {
+                this.settings.config.theme = theme;
             }
-            if (this.compression !== '') {
-                this.settings.config.compression = this.compression;
+            if (compression !== '') {
+                this.settings.config.compression = compression;
             }
             this.settings.listFreeSpace();
-            if (await utils_2.default.customConfirm('Select yes to continue...'))
+            if (await utils_2.default.customConfirm('Select yes to continue...')) {
                 return true;
+            }
         }
         return false;
     }
@@ -96,21 +81,24 @@ class Ovary {
      * @param basename
      */
     async produce(backup = false, scriptOnly = false, yolkRenew = false, release = false, myAddons, verbose = false) {
-        const echo = utils_2.default.setEcho(verbose);
-        const echoYes = utils_2.default.setEcho(true);
+        this.verbose = verbose;
+        this.echo = utils_2.default.setEcho(verbose);
+        if (this.verbose) {
+            this.toNull = ' > /dev/null 2>&1';
+        }
         let luksName = 'luks-eggs-backup';
         let luksFile = `/tmp/${luksName}`;
-        let luksDevice = `/dev/mapper/${luksName}`;
-        let luksMountpoint = `/mnt`;
+        // let luksDevice = `/dev/mapper/${luksName}`
+        // let luksMountpoint = `/mnt`
         if (this.familyId === 'debian') {
             const yolk = new yolk_1.default();
-            if (!yolk.exists()) {
-                utils_2.default.warning('local repo yolk creation...');
+            if (!yolk.yolkExists()) {
+                utils_2.default.warning('local repository /var/local/yolk creation...');
                 await yolk.create(verbose);
             }
             else if (yolkRenew) {
-                utils_2.default.warning('force renew local repository yolk...');
-                yolk.clean();
+                utils_2.default.warning('force renew local repository /var/local/yolk...');
+                yolk.yolkClean();
                 await yolk.create(verbose);
             }
             else {
@@ -120,12 +108,12 @@ class Ovary {
         if (!fs.existsSync(this.settings.config.snapshot_dir)) {
             shelljs_1.default.mkdir('-p', this.settings.config.snapshot_dir);
         }
-        await this.settings.loadRemix(this.snapshot_basename, this.theme);
+        await this.settings.loadRemix(this.snapshot_basename, this.settings.config.theme);
         if (utils_2.default.isLive()) {
             console.log(chalk_1.default.red('>>> eggs: This is a live system! An egg cannot be produced from an egg!'));
         }
         else {
-            await this.liveCreateStructure(verbose);
+            await this.liveCreateStructure();
             if (this.settings.distro.isCalamaresAvailable && (pacman_1.default.isInstalledGui()) && this.settings.config.force_installer && !(await pacman_1.default.calamaresCheck())) {
                 console.log('Installing ' + chalk_1.default.bgGray('calamares') + ' due force_installer=yes.');
                 await pacman_1.default.calamaresInstall(verbose);
@@ -133,14 +121,15 @@ class Ovary {
                 await bleach.clean(verbose);
             }
             if (backup) {
-                /**
-                 *  We will remove users and servers homes from ISO
-                 */
-                console.log(`The following private data will removed from your ISO:`);
+                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);
                         }
@@ -148,10 +137,7 @@ class Ovary {
                 }
             }
             else {
-                /**
-                 *  We will remove all the users from ISO, but servers and data will be included uncrypted
-                 */
-                utils_2.default.warning('eggs will remove all the users from ISO, but servers homes 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
@@ -168,141 +154,115 @@ class Ovary {
                  */
                 this.incubator = new incubator_1.default(this.settings.remix, this.settings.distro, this.settings.config.user_opt, verbose);
                 await this.incubator.config(release);
-                await this.syslinux(verbose);
-                await this.isolinux(this.theme, verbose);
-                await this.kernelCopy(verbose);
+                await this.syslinux();
+                await this.isolinux(this.settings.config.theme);
+                await this.kernelCopy();
                 /**
                  * we need different behaviour on
                  * initrd for different familis
                  */
                 if (this.familyId === 'debian') {
-                    await this.initrdCopy(verbose);
+                    await this.initrdCopy();
                 }
                 else if (this.familyId === 'archlinux') {
-                    await this.initrdCreate(verbose);
+                    await this.initrdCreate();
                 }
                 if (this.settings.config.make_efi) {
-                    await this.makeEfi(this.theme, verbose);
+                    await this.makeEfi(this.settings.config.theme);
                 }
-                await this.bindLiveFs(verbose);
+                await this.bindLiveFs();
                 await this.cleanUsersAccounts();
-                await this.createUserLive(verbose);
+                await this.createUserLive();
                 if (pacman_1.default.isInstalledGui()) {
-                    await this.createXdgAutostart(this.theme, myAddons);
+                    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(verbose);
-                await this.makeSquashfs(scriptOnly, verbose);
-                await this.uBindLiveFs(verbose); // Lo smonto prima della fase di backup
+                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');
+                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`, echo);
+                await (0, utils_1.exec)(`mv ${luksFile} ${this.settings.config.snapshot_dir}ovarium/iso/live`, this.echo);
             }
-            const xorrisoCommand = this.makeDotDisk(backup, verbose);
+            const xorrisoCommand = this.makeDotDisk(backup);
             /**
              * patch to emulate miso archilinux
              */
             if (this.familyId === 'archlinux') {
-                await (0, utils_1.exec)(`mkdir ${this.settings.work_dir.pathIso}/live/x86_64`, echo);
-                await (0, utils_1.exec)(`ln ${this.settings.work_dir.pathIso}/live/filesystem.squashfs ${this.settings.work_dir.pathIso}/live/x86_64/livefs.sfs`, echo);
+                await (0, utils_1.exec)(`mkdir ${this.settings.work_dir.pathIso}/live/x86_64`, this.echo);
+                await (0, utils_1.exec)(`ln ${this.settings.work_dir.pathIso}/live/filesystem.squashfs ${this.settings.work_dir.pathIso}/live/x86_64/livefs.sfs`, this.echo);
             }
-            await this.makeIso(xorrisoCommand, scriptOnly, verbose);
+            await this.makeIso(xorrisoCommand, scriptOnly);
         }
     }
     /**
      * Crea la struttura della workdir
      */
-    async liveCreateStructure(verbose = false) {
-        if (verbose) {
+    async liveCreateStructure() {
+        if (this.verbose) {
             console.log('Overy: liveCreateStructure');
         }
         utils_2.default.warning(`Creating egg in ${this.settings.work_dir.path}`);
+        let cmd;
         if (!fs.existsSync(this.settings.work_dir.path)) {
-            try {
-                shelljs_1.default.mkdir('-p', this.settings.work_dir.path);
-            }
-            catch (error) {
-                console.log('error: ' + error + ' creating ' + this.settings.work_dir.path);
-            }
+            cmd = `mkdir -p ${this.settings.work_dir.path}`;
+            this.tryCatch(cmd);
         }
         if (!fs.existsSync(this.settings.work_dir.path + '/README.md')) {
-            try {
-                shelljs_1.default.cp(node_path_1.default.resolve(__dirname, '../../conf/README.md'), this.settings.work_dir.path + 'README.md');
-            }
-            catch (error) {
-                console.log('error: ' + error + ' creating ' + node_path_1.default.resolve(__dirname, '../../conf/README.md'), this.settings.work_dir.path + 'README.md');
-            }
+            cmd = `cp ${node_path_1.default.resolve(__dirname, '../../conf/README.md')} ${this.settings.work_dir.path}README.md}`;
+            this.tryCatch(cmd);
         }
         if (!fs.existsSync(this.settings.work_dir.lowerdir)) {
-            try {
-                shelljs_1.default.mkdir('-p', this.settings.work_dir.lowerdir);
-            }
-            catch (error) {
-                console.log('error: ' + error + ' creating ' + this.settings.work_dir.lowerdir);
-            }
+            cmd = `mkdir -p ${this.settings.work_dir.lowerdir}`;
+            this.tryCatch(cmd);
         }
         if (!fs.existsSync(this.settings.work_dir.upperdir)) {
-            try {
-                shelljs_1.default.mkdir('-p', this.settings.work_dir.upperdir);
-            }
-            catch (error) {
-                console.log('error: ' + error + ' creating ' + this.settings.work_dir.upperdir);
-            }
+            cmd = `mkdir -p ${this.settings.work_dir.upperdir}`;
+            this.tryCatch(cmd);
         }
         if (!fs.existsSync(this.settings.work_dir.workdir)) {
-            try {
-                shelljs_1.default.mkdir('-p', this.settings.work_dir.workdir);
-            }
-            catch (error) {
-                console.log('error: ' + error + ' creating ' + this.settings.work_dir.workdir);
-            }
+            cmd = `mkdir -p ${this.settings.work_dir.workdir}`;
+            this.tryCatch(cmd);
         }
         if (!fs.existsSync(this.settings.work_dir.merged)) {
-            try {
-                shelljs_1.default.mkdir('-p', this.settings.work_dir.merged);
-            }
-            catch (error) {
-                console.log('error: ' + error + ' creating ' + this.settings.work_dir.merged);
-            }
+            cmd = `mkdir -p ${this.settings.work_dir.merged}`;
+            this.tryCatch(cmd);
         }
         /**
          * Creo le directory di destinazione per boot, efi, isolinux e live
          * precedentemente in isolinux
          */
         if (!fs.existsSync(this.settings.work_dir.pathIso)) {
-            try {
-                shelljs_1.default.mkdir('-p', this.settings.work_dir.pathIso + '/boot/grub/' + utils_2.default.machineUEFI());
-            }
-            catch (error) {
-                console.log('error: ' + error + ' creating ' + this.settings.work_dir.pathIso + '/boot/grub/' + utils_2.default.machineUEFI());
-            }
-            try {
-                shelljs_1.default.mkdir('-p', this.settings.work_dir.pathIso + '/efi/boot');
-            }
-            catch (error) {
-                console.log('error: ' + error + ' creating ' + this.settings.work_dir.pathIso + '/efi/boot');
-            }
-            try {
-                shelljs_1.default.mkdir('-p', this.settings.work_dir.pathIso + '/isolinux');
-            }
-            catch {
-                shelljs_1.default.mkdir('-p', this.settings.work_dir.pathIso + '/isolinux');
-            }
-            try {
-                shelljs_1.default.mkdir('-p', this.settings.work_dir.pathIso + '/live');
-            }
-            catch {
-                shelljs_1.default.mkdir('-p', this.settings.work_dir.pathIso + '/live');
-            }
+            cmd = `mkdir -p ${this.settings.work_dir.pathIso}/boot/grub/${utils_2.default.machineUEFI()}`;
+            this.tryCatch(cmd);
+            cmd = `mkdir -p ${this.settings.work_dir.pathIso}/efi/boot`;
+            this.tryCatch(cmd);
+            cmd = `mkdir -p ${this.settings.work_dir.pathIso}/isolinux`;
+            this.tryCatch(cmd);
+            cmd = `mkdir -p ${this.settings.work_dir.pathIso}/live`;
+            this.tryCatch(cmd);
+        }
+    }
+    /**
+     *
+     * @param cmd
+     */
+    async tryCatch(cmd = '') {
+        try {
+            await (0, utils_1.exec)(cmd, this.echo);
+        }
+        catch (error) {
+            console.log(`Error: ${error}`);
+            await utils_2.default.pressKeyToExit(cmd);
         }
     }
     /**
@@ -315,9 +275,8 @@ class Ovary {
      * - Add some basic files to /dev
      * - Clear configs from /etc/network/interfaces, wicd and NetworkManager and netman
      */
-    async editLiveFs(verbose = false) {
-        const echo = utils_2.default.setEcho(verbose);
-        if (verbose) {
+    async editLiveFs() {
+        if (this.verbose) {
             console.log('ovary: editLiveFs');
         }
         if (this.familyId === 'debian') {
@@ -326,42 +285,50 @@ class Ovary {
             const file = '/etc/initramfs-tools/conf.d/eggs-safe-initramfs.conf';
             utils_2.default.write(file, text);
         }
-        // sudo systemctl disable wpa_supplicant
         // Truncate logs, remove archived logs.
         let cmd = `find ${this.settings.work_dir.merged}/var/log -name "*gz" -print0 | xargs -0r rm -f`;
-        await (0, utils_1.exec)(cmd, echo);
+        await (0, utils_1.exec)(cmd, this.echo);
         cmd = `find ${this.settings.work_dir.merged}/var/log/ -type f -exec truncate -s 0 {} \\;`;
-        await (0, utils_1.exec)(cmd, echo);
+        await (0, utils_1.exec)(cmd, this.echo);
         // Allow all fixed drives to be mounted with pmount
         if (this.settings.config.pmount_fixed && fs.existsSync(`${this.settings.work_dir.merged}/etc/pmount.allow`)) {
             // MX aggiunto /etc
-            await (0, utils_1.exec)(`sed -i 's:#/dev/sd\[a-z\]:/dev/sd\[a-z\]:' ${this.settings.work_dir.merged}/etc/pmount.allow`, echo);
+            await (0, utils_1.exec)(`sed -i 's:#/dev/sd\[a-z\]:/dev/sd\[a-z\]:' ${this.settings.work_dir.merged}/etc/pmount.allow`, this.echo);
         }
         // Enable or disable password login through ssh for users (not root)
         // Remove obsolete live-config file
         if (fs.existsSync(`${this.settings.work_dir.merged}lib/live/config/1161-openssh-server`)) {
-            await (0, utils_1.exec)('rm -f "$work_dir"/myfs/lib/live/config/1161-openssh-server', echo);
+            await (0, utils_1.exec)('rm -f "$work_dir"/myfs/lib/live/config/1161-openssh-server', this.echo);
         }
         if (fs.existsSync(`${this.settings.work_dir.merged}/etc/ssh/sshd_config`)) {
-            await (0, utils_1.exec)(`sed -i 's/PermitRootLogin yes/PermitRootLogin prohibit-password/' ${this.settings.work_dir.merged}/etc/ssh/sshd_config`, echo);
+            await (0, utils_1.exec)(`sed -i 's/PermitRootLogin yes/PermitRootLogin prohibit-password/' ${this.settings.work_dir.merged}/etc/ssh/sshd_config`, this.echo);
             await (this.settings.config.ssh_pass
-                ? (0, utils_1.exec)(`sed -i 's|.*PasswordAuthentication.*no|PasswordAuthentication yes|' ${this.settings.work_dir.merged}/etc/ssh/sshd_config`, echo)
-                : (0, utils_1.exec)(`sed -i 's|.*PasswordAuthentication.*yes|PasswordAuthentication no|' ${this.settings.work_dir.merged}/etc/ssh/sshd_config`, echo));
+                ? (0, utils_1.exec)(`sed -i 's|.*PasswordAuthentication.*no|PasswordAuthentication yes|' ${this.settings.work_dir.merged}/etc/ssh/sshd_config`, this.echo)
+                : (0, utils_1.exec)(`sed -i 's|.*PasswordAuthentication.*yes|PasswordAuthentication no|' ${this.settings.work_dir.merged}/etc/ssh/sshd_config`, this.echo));
         }
         /**
          * /etc/fstab should exist, even if it's empty,
          * to prevent error messages at boot
          */
-        await (0, utils_1.exec)(`rm ${this.settings.work_dir.merged}/etc/fstab`, echo);
-        await (0, utils_1.exec)(`touch ${this.settings.work_dir.merged}/etc/fstab`, echo);
+        await (0, utils_1.exec)(`rm ${this.settings.work_dir.merged}/etc/fstab`, this.echo);
+        await (0, utils_1.exec)(`touch ${this.settings.work_dir.merged}/etc/fstab`, this.echo);
         /**
-         * Blank out systemd machine id. If it does not exist, systemd-journald
-         * will fail, but if it exists and is empty, systemd will automatically
+         * Remove crypttab if exists
+         * this is crucial for tpm systems.
+         */
+        if (fs.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.
+         * If it does not exist, systemd-journald will fail,
+         * but if it exists and is empty, systemd will automatically
          * set up a new unique ID.
          */
         if (fs.existsSync(`${this.settings.work_dir.merged}/etc/machine-id`)) {
-            await (0, utils_1.exec)(`rm ${this.settings.work_dir.merged}/etc/machine-id`, echo);
-            await (0, utils_1.exec)(`touch ${this.settings.work_dir.merged}/etc/machine-id`, echo);
+            await (0, utils_1.exec)(`rm ${this.settings.work_dir.merged}/etc/machine-id`, this.echo);
+            await (0, utils_1.exec)(`touch ${this.settings.work_dir.merged}/etc/machine-id`, this.echo);
             utils_2.default.write(`${this.settings.work_dir.merged}/etc/machine-id`, ':');
         }
         /**
@@ -373,158 +340,160 @@ class Ovary {
          * Per tutte le distro systemd
          */
         if (utils_2.default.isSystemd()) {
+            utils_2.default.warning('systemd');
+            const systemdctl = new systemctl_1.default(this.verbose);
             /**
              * SU UBUNTU E DERIVATE NON DISABILITARE systemd-resolved.service
              */
             if (this.settings.distro.distroLike !== 'Ubuntu') {
-                await (0, utils_1.exec)(`chroot ${this.settings.work_dir.merged} systemctl disable systemd-resolved.service`);
+                if (await systemdctl.isEnabled('systemd-systemd-resolved.service')) {
+                    await systemdctl.disable('systemd-systemd-resolved.service', this.settings.work_dir.merged, true);
+                }
             }
-            // systemctl is-enabled
-            const systemdctl = new systemctl_1.default();
             if (await systemdctl.isEnabled('systemd-networkd.service')) {
-                await (0, utils_1.exec)(`chroot ${this.settings.work_dir.merged} systemctl disable systemd-networkd.service`);
+                await systemdctl.disable('systemd-networkd.service', this.settings.work_dir.merged, true);
             }
             if (await systemdctl.isEnabled('remote-cryptsetup.target')) {
-                await (0, utils_1.exec)(`chroot ${this.settings.work_dir.merged} systemctl disable remote-cryptsetup.target`);
+                await systemdctl.disable('remote-cryptsetup.target', this.settings.work_dir.merged, true);
             }
             if (await systemdctl.isEnabled('speech-dispatcherd.service')) {
-                await (0, utils_1.exec)(`chroot ${this.settings.work_dir.merged} systemctl disable speech-dispatcherd.service`);
+                await systemdctl.disable('speech-dispatcherd.service', this.settings.work_dir.merged, true);
             }
             if (await systemdctl.isEnabled('wpa_supplicant-nl80211@.service')) {
-                await (0, utils_1.exec)(`chroot ${this.settings.work_dir.merged} systemctl disable wpa_supplicant-nl80211@.service`);
+                await systemdctl.disable('wpa_supplicant-nl80211@.service', this.settings.work_dir.merged, true);
             }
             if (await systemdctl.isEnabled('wpa_supplicant@.service')) {
-                await (0, utils_1.exec)(`chroot ${this.settings.work_dir.merged} systemctl disable wpa_supplicant@.service`);
+                await systemdctl.disable('wpa_supplicant@.service', this.settings.work_dir.merged, true);
             }
             if (await systemdctl.isEnabled('wpa_supplicant-wired@.service')) {
-                await (0, utils_1.exec)(`chroot ${this.settings.work_dir.merged} systemctl disable wpa_supplicant-wired@.service`);
+                await systemdctl.disable('wpa_supplicant-wired@.service', this.settings.work_dir.merged, true);
+            }
+            /**
+             * All systemd distros rm
+             */
+            await (0, utils_1.exec)(`rm -f ${this.settings.work_dir.merged}/var/lib/wicd/configurations/*`, this.echo);
+            await (0, utils_1.exec)(`rm -f ${this.settings.work_dir.merged}/etc/wicd/wireless-settings.conf`, this.echo);
+            await (0, utils_1.exec)(`rm -f ${this.settings.work_dir.merged}/etc/NetworkManager/system-connections/*`, this.echo);
+            await (0, utils_1.exec)(`rm -f ${this.settings.work_dir.merged}/etc/network/wifi/*`, this.echo);
+            /**
+             * removing from /etc/network/:
+             * if-down.d if-post-down.d if-pre-up.d if-up.d interfaces interfaces.d
+             */
+            const cleanDirs = ['if-down.d', 'if-post-down.d', 'if-pre-up.d', 'if-up.d', 'interfaces.d'];
+            let cleanDir = '';
+            for (cleanDir of cleanDirs) {
+                await (0, utils_1.exec)(`rm -f ${this.settings.work_dir.merged}/etc/network/${cleanDir}/wpasupplicant`, this.echo);
             }
         }
-        // Probabilmente non necessario
-        // shx.touch(`${this.settings.work_dir.merged}/etc/resolv.conf`)
+        /**
+         * cleaning /etc/resolv.conf
+         * /etc/resolv.conf -> ../run/systemd/resolve/stub-resolv.conf
+         */
+        shelljs_1.default.rm(`${this.settings.work_dir.merged}/etc/resolv.conf`);
+        shelljs_1.default.touch(`${this.settings.work_dir.merged}/etc/resolv.conf`);
         /**
          * Clear configs from /etc/network/interfaces, wicd and NetworkManager
          * and netman, so they aren't stealthily included in the snapshot.
          */
         if (this.familyId === 'debian') {
             if (fs.existsSync(`${this.settings.work_dir.merged}/etc/network/interfaces`)) {
-                await (0, utils_1.exec)(`rm ${this.settings.work_dir.merged}/etc/network/interfaces`, echo);
+                await (0, utils_1.exec)(`rm ${this.settings.work_dir.merged}/etc/network/interfaces`, this.echo);
             }
-            await (0, utils_1.exec)(`touch ${this.settings.work_dir.merged}/etc/network/interfaces`, echo);
+            await (0, utils_1.exec)(`touch ${this.settings.work_dir.merged}/etc/network/interfaces`, this.echo);
             utils_2.default.write(`${this.settings.work_dir.merged}/etc/network/interfaces`, 'auto lo\niface lo inet loopback');
         }
-        /**
-         * Per tutte le distro systemd
-         */
-        if (utils_2.default.isSystemd()) {
-            await (0, utils_1.exec)(`rm -f ${this.settings.work_dir.merged}/var/lib/wicd/configurations/*`, echo);
-            await (0, utils_1.exec)(`rm -f ${this.settings.work_dir.merged}/etc/wicd/wireless-settings.conf`, echo);
-            await (0, utils_1.exec)(`rm -f ${this.settings.work_dir.merged}/etc/NetworkManager/system-connections/*`, echo);
-            await (0, utils_1.exec)(`rm -f ${this.settings.work_dir.merged}/etc/network/wifi/*`, echo);
-            /**
-             * Andiamo a fare pulizia in /etc/network/:
-             * if-down.d  if-post-down.d  if-pre-up.d  if-up.d  interfaces  interfaces.d
-             */
-            const cleanDirs = ['if-down.d', 'if-post-down.d', 'if-pre-up.d', 'if-up.d', 'interfaces.d'];
-            let cleanDir = '';
-            for (cleanDir of cleanDirs) {
-                await (0, utils_1.exec)(`rm -f ${this.settings.work_dir.merged}/etc/network/${cleanDir}/wpasupplicant`, echo);
-            }
-        }
         /**
          * add some basic files to /dev
          */
         if (!fs.existsSync(`${this.settings.work_dir.merged}/dev/console`)) {
-            await (0, utils_1.exec)(`mknod -m 622 ${this.settings.work_dir.merged}/dev/console c 5 1`, echo);
+            await (0, utils_1.exec)(`mknod -m 622 ${this.settings.work_dir.merged}/dev/console c 5 1`, this.echo);
         }
         if (!fs.existsSync(`${this.settings.work_dir.merged}/dev/null`)) {
-            await (0, utils_1.exec)(`mknod -m 666 ${this.settings.work_dir.merged}/dev/null c 1 3`, echo);
+            await (0, utils_1.exec)(`mknod -m 666 ${this.settings.work_dir.merged}/dev/null c 1 3`, this.echo);
         }
         if (!fs.existsSync(`${this.settings.work_dir.merged}/dev/zero`)) {
-            await (0, utils_1.exec)(`mknod -m 666 ${this.settings.work_dir.merged}/dev/zero c 1 5`, echo);
+            await (0, utils_1.exec)(`mknod -m 666 ${this.settings.work_dir.merged}/dev/zero c 1 5`, this.echo);
         }
         if (!fs.existsSync(`${this.settings.work_dir.merged}/dev/ptmx`)) {
-            await (0, utils_1.exec)(`mknod -m 666 ${this.settings.work_dir.merged}/dev/ptmx c 5 2`, echo);
+            await (0, utils_1.exec)(`mknod -m 666 ${this.settings.work_dir.merged}/dev/ptmx c 5 2`, this.echo);
         }
         if (!fs.existsSync(`${this.settings.work_dir.merged}/dev/tty`)) {
-            await (0, utils_1.exec)(`mknod -m 666 ${this.settings.work_dir.merged}/dev/tty c 5 0`, echo);
+            await (0, utils_1.exec)(`mknod -m 666 ${this.settings.work_dir.merged}/dev/tty c 5 0`, this.echo);
         }
         if (!fs.existsSync(`${this.settings.work_dir.merged}/dev/random`)) {
-            await (0, utils_1.exec)(`mknod -m 444 ${this.settings.work_dir.merged}/dev/random c 1 8`, echo);
+            await (0, utils_1.exec)(`mknod -m 444 ${this.settings.work_dir.merged}/dev/random c 1 8`, this.echo);
         }
         if (!fs.existsSync(`${this.settings.work_dir.merged}/dev/urandom`)) {
-            await (0, utils_1.exec)(`mknod -m 444 ${this.settings.work_dir.merged}/dev/urandom c 1 9`, echo);
+            await (0, utils_1.exec)(`mknod -m 444 ${this.settings.work_dir.merged}/dev/urandom c 1 9`, this.echo);
         }
         if (!fs.existsSync(`${this.settings.work_dir.merged}/dev/{console,ptmx,tty}`)) {
-            await (0, utils_1.exec)(`chown -v root:tty ${this.settings.work_dir.merged}/dev/{console,ptmx,tty}`, echo);
+            await (0, utils_1.exec)(`chown -v root:tty ${this.settings.work_dir.merged}/dev/{console,ptmx,tty}`, this.echo);
         }
         if (!fs.existsSync(`${this.settings.work_dir.merged}/dev/fd`)) {
-            await (0, utils_1.exec)(`ln -sv /proc/self/fd ${this.settings.work_dir.merged}/dev/fd`, echo);
+            await (0, utils_1.exec)(`ln -sv /proc/self/fd ${this.settings.work_dir.merged}/dev/fd`, this.echo);
         }
         if (!fs.existsSync(`${this.settings.work_dir.merged}/dev/stdin`)) {
-            await (0, utils_1.exec)(`ln -sv /proc/self/fd/0 ${this.settings.work_dir.merged}/dev/stdin`, echo);
+            await (0, utils_1.exec)(`ln -sv /proc/self/fd/0 ${this.settings.work_dir.merged}/dev/stdin`, this.echo);
         }
         if (!fs.existsSync(`${this.settings.work_dir.merged}/dev/stdout`)) {
-            await (0, utils_1.exec)(`ln -sv /proc/self/fd/1 ${this.settings.work_dir.merged}/dev/stdout`, echo);
+            await (0, utils_1.exec)(`ln -sv /proc/self/fd/1 ${this.settings.work_dir.merged}/dev/stdout`, this.echo);
         }
         if (!fs.existsSync(`${this.settings.work_dir.merged}/dev/stderr`)) {
-            await (0, utils_1.exec)(`ln -sv /proc/self/fd/2 ${this.settings.work_dir.merged}/dev/stderr`, echo);
+            await (0, utils_1.exec)(`ln -sv /proc/self/fd/2 ${this.settings.work_dir.merged}/dev/stderr`, this.echo);
         }
         if (!fs.existsSync(`${this.settings.work_dir.merged}/dev/core`)) {
-            await (0, utils_1.exec)(`ln -sv /proc/kcore ${this.settings.work_dir.merged}/dev/core`, echo);
+            await (0, utils_1.exec)(`ln -sv /proc/kcore ${this.settings.work_dir.merged}/dev/core`, this.echo);
         }
         if (!fs.existsSync(`${this.settings.work_dir.merged}/dev/shm`)) {
-            await (0, utils_1.exec)(`mkdir -v ${this.settings.work_dir.merged}/dev/shm`, echo);
+            await (0, utils_1.exec)(`mkdir -v ${this.settings.work_dir.merged}/dev/shm`, this.echo);
         }
         if (!fs.existsSync(`${this.settings.work_dir.merged}/dev/pts`)) {
-            await (0, utils_1.exec)(`mkdir -v ${this.settings.work_dir.merged}/dev/pts`, echo);
+            await (0, utils_1.exec)(`mkdir -v ${this.settings.work_dir.merged}/dev/pts`, this.echo);
         }
         if (!fs.existsSync(`${this.settings.work_dir.merged}/dev/shm`)) {
-            await (0, utils_1.exec)(`chmod 1777 ${this.settings.work_dir.merged}/dev/shm`, echo);
+            await (0, utils_1.exec)(`chmod 1777 ${this.settings.work_dir.merged}/dev/shm`, this.echo);
         }
         /**
          * Assegno 1777 a /tmp
          * creava problemi con MXLINUX
          */
         if (!fs.existsSync(`${this.settings.work_dir.merged}/tmp`)) {
-            await (0, utils_1.exec)(`mkdir ${this.settings.work_dir.merged}/tmp`, echo);
+            await (0, utils_1.exec)(`mkdir ${this.settings.work_dir.merged}/tmp`, this.echo);
         }
-        await (0, utils_1.exec)(`chmod 1777 ${this.settings.work_dir.merged}/tmp`, echo);
+        await (0, utils_1.exec)(`chmod 1777 ${this.settings.work_dir.merged}/tmp`, this.echo);
     }
     /**
      * syslinux
      */
-    async syslinux(verbose = false) {
-        const echo = utils_2.default.setEcho(verbose);
-        if (verbose) {
+    async syslinux() {
+        if (this.verbose) {
             console.log('ovary: syslinux');
             console.log('syslinux path: ' + this.settings.distro.syslinuxPath);
         }
-        await (0, utils_1.exec)(`cp ${this.settings.distro.syslinuxPath}/vesamenu.c32 ${this.settings.work_dir.pathIso}/isolinux/`, echo);
-        await (0, utils_1.exec)(`cp ${this.settings.distro.syslinuxPath}/chain.c32 ${this.settings.work_dir.pathIso}/isolinux/`, echo);
+        await (0, utils_1.exec)(`cp ${this.settings.distro.syslinuxPath}/vesamenu.c32 ${this.settings.work_dir.pathIso}/isolinux/`, this.echo);
+        await (0, utils_1.exec)(`cp ${this.settings.distro.syslinuxPath}/chain.c32 ${this.settings.work_dir.pathIso}/isolinux/`, this.echo);
         /**
          * per openSuse non sono riusciuto a determinare
          * quale pacchetto installi:
          * ldllinux.c43, libcom32 e libutil.c32
          */
         if (this.familyId !== 'suse') {
-            await (0, utils_1.exec)(`cp ${this.settings.distro.syslinuxPath}/ldlinux.c32 ${this.settings.work_dir.pathIso}/isolinux/`, echo);
-            await (0, utils_1.exec)(`cp ${this.settings.distro.syslinuxPath}/libcom32.c32 ${this.settings.work_dir.pathIso}/isolinux/`, echo);
-            await (0, utils_1.exec)(`cp ${this.settings.distro.syslinuxPath}/libutil.c32 ${this.settings.work_dir.pathIso}/isolinux/`, echo);
+            await (0, utils_1.exec)(`cp ${this.settings.distro.syslinuxPath}/ldlinux.c32 ${this.settings.work_dir.pathIso}/isolinux/`, this.echo);
+            await (0, utils_1.exec)(`cp ${this.settings.distro.syslinuxPath}/libcom32.c32 ${this.settings.work_dir.pathIso}/isolinux/`, this.echo);
+            await (0, utils_1.exec)(`cp ${this.settings.distro.syslinuxPath}/libutil.c32 ${this.settings.work_dir.pathIso}/isolinux/`, this.echo);
         }
     }
     /**
      *  async isolinux
      */
-    async isolinux(theme = 'eggs', verbose = false) {
-        const echo = utils_2.default.setEcho(verbose);
-        if (verbose) {
+    async isolinux(theme = 'eggs') {
+        if (this.verbose) {
             console.log('ovary: isolinux');
         }
         /**
          * isolinux.bin
          */
-        await (0, utils_1.exec)(`cp ${this.settings.distro.isolinuxPath}/isolinux.bin ${this.settings.work_dir.pathIso}/isolinux/`, echo);
+        await (0, utils_1.exec)(`cp ${this.settings.distro.isolinuxPath}/isolinux.bin ${this.settings.work_dir.pathIso}/isolinux/`, this.echo);
         /**
          * isolinux.theme.cfg
          */
@@ -572,14 +541,13 @@ class Ovary {
     /**
      * copy kernel
      */
-    async kernelCopy(verbose = false) {
-        const echo = utils_2.default.setEcho(verbose);
-        if (verbose) {
+    async kernelCopy() {
+        if (this.verbose) {
             console.log('ovary: kernelCopy');
         }
         let lackVmlinuzImage = false;
         if (fs.existsSync(this.settings.kernel_image)) {
-            await (0, utils_1.exec)(`cp ${this.settings.kernel_image} ${this.settings.work_dir.pathIso}/live/`, echo);
+            await (0, utils_1.exec)(`cp ${this.settings.kernel_image} ${this.settings.work_dir.pathIso}/live/`, this.echo);
         }
         else {
             utils_2.default.error(`Cannot find ${this.settings.kernel_image}`);
@@ -592,60 +560,64 @@ class Ovary {
         }
     }
     /**
-     * necessita di verbose
+     * necessita di echoYes
      */
-    async initrdCreate(verbose = false) {
-        verbose = true;
-        const echo = utils_2.default.setEcho(verbose);
+    async initrdCreate() {
         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/`);
-        // shx.cp(path.resolve(__dirname, '../../conf/README.md'), this.settings.work_dir.path + 'README.md')
-        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}`, echo);
+        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));
     }
     /**
-     *
-     * @param verbose
+     * We must upgrade to initrdCreate for Debian/Ubuntu
      * @returns
      */
     async initrdCopy(verbose = false) {
-        utils_2.default.warning(`initrdCopy`);
-        const echo = utils_2.default.setEcho(verbose);
-        if (verbose) {
-            console.log('ovary: initrdCopy');
-        }
-        let lackInitrdImage = false;
+        let isCrypted = false;
+        utils_2.default.warning(`initrdCreate`);
+        if (fs.existsSync(`/etc/crypttab`)) {
+            isCrypted = true;
+            await (0, utils_1.exec)(`mv /etc/crypttab /etc/crypttab.saved`, this.echo);
+        }
+        await (0, utils_1.exec)(`mkinitramfs -o ${this.settings.work_dir.pathIso}/live/initrd.img-$(uname -r) ${this.toNull}`, this.echo);
+        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 (0, utils_1.exec)(`cp ${this.settings.initrd_image} ${this.settings.work_dir.pathIso}/live/`, echo);
-        }
-        else {
-            utils_2.default.error(`Cannot find ${this.settings.initrdImg}`);
-            lackInitrdImage = true;
+          await exec(`cp ${this.settings.initrd_image} ${this.settings.work_dir.pathIso}/live/`, this.echo)
+        } else {
+          Utils.error(`Cannot find ${this.settings.initrdImg}`)
+          lackInitrdImage = true
         }
+    
         if (lackInitrdImage) {
-            utils_2.default.warning('Try to edit /etc/penguins-eggs.d/eggs.yaml and check for');
-            utils_2.default.warning(`initrd_img: ${this.settings.initrd_image}`);
-            process.exit(1);
+          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
      */
-    async makeSquashfs(scriptOnly = false, verbose = false) {
-        let echo = { echo: false, ignore: false };
-        if (verbose) {
-            echo = { echo: true, ignore: false };
-        }
-        if (verbose) {
+    async makeSquashfs(scriptOnly = false) {
+        if (this.verbose) {
             console.log('ovary: makeSquashfs');
         }
         /**
          * exclude all the accurence of cryptdisks in rc0.d, etc
          */
-        // let fexcludes = ["/boot/efi/EFI", "/etc/fstab", "/etc/mtab", "/etc/udev/rules.d/70-persistent-cd.rules", "/etc/udev/rules.d/70-persistent-net.rules"]
-        //  for (let i in fexcludes) {
-        //   this.addRemoveExclusion(true, fexcludes[i])
-        // }
+        let fexcludes = ["/boot/efi/EFI", "/etc/fstab", "/etc/mtab", "/etc/udev/rules.d/70-persistent-cd.rules", "/etc/udev/rules.d/70-persistent-net.rules"];
+        for (let i in fexcludes) {
+            this.addRemoveExclusion(true, fexcludes[i]);
+        }
         /**
          * Non sò che fa, ma sicuro non serve per archlinux
          */
@@ -675,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, echo);
+            await (0, utils_1.exec)(cmd, utils_2.default.setEcho(true));
         }
     }
     /**
@@ -738,10 +710,8 @@ class Ovary {
      *
      * @param verbose
      */
-    async bindLiveFs(verbose = false) {
-        verbose = false;
-        const echo = utils_2.default.setEcho(verbose);
-        if (verbose) {
+    async bindLiveFs() {
+        if (this.verbose) {
             console.log('ovary: bindLiveFs');
         }
         /**
@@ -769,35 +739,35 @@ class Ovary {
                          */
                         cmds.push(`${cmd} need to be presente, and rw`, titleLine, '# create mountpoint lower');
                         cmds.push(await makeIfNotExist(`${this.settings.work_dir.lowerdir}/${dir}`), `# first: mount /${dir} rw in ${this.settings.work_dir.lowerdir}/${dir}`);
-                        cmds.push(await rexec(`mount --bind --make-slave /${dir} ${this.settings.work_dir.lowerdir}/${dir}`, verbose), '# now remount it ro');
-                        cmds.push(await rexec(`mount -o remount,bind,ro ${this.settings.work_dir.lowerdir}/${dir}`, verbose), `\n# second: create mountpoint upper, work and ${this.settings.work_dir.merged} and mount ${dir}`);
-                        cmds.push(await makeIfNotExist(`${this.settings.work_dir.upperdir}/${dir}`, verbose));
-                        cmds.push(await makeIfNotExist(`${this.settings.work_dir.workdir}/${dir}`, verbose));
-                        cmds.push(await makeIfNotExist(`${this.settings.work_dir.merged}/${dir}`, verbose), `\n# thirth: mount /${dir} rw in ${this.settings.work_dir.merged}`);
-                        cmds.push(await rexec(`mount -t overlay overlay -o lowerdir=${this.settings.work_dir.lowerdir}/${dir},upperdir=${this.settings.work_dir.upperdir}/${dir},workdir=${this.settings.work_dir.workdir}/${dir} ${this.settings.work_dir.merged}/${dir}`, verbose));
+                        cmds.push(await rexec(`mount --bind --make-slave /${dir} ${this.settings.work_dir.lowerdir}/${dir}`, this.verbose), '# now remount it ro');
+                        cmds.push(await rexec(`mount -o remount,bind,ro ${this.settings.work_dir.lowerdir}/${dir}`, this.verbose), `\n# second: create mountpoint upper, work and ${this.settings.work_dir.merged} and mount ${dir}`);
+                        cmds.push(await makeIfNotExist(`${this.settings.work_dir.upperdir}/${dir}`, this.verbose));
+                        cmds.push(await makeIfNotExist(`${this.settings.work_dir.workdir}/${dir}`, this.verbose));
+                        cmds.push(await makeIfNotExist(`${this.settings.work_dir.merged}/${dir}`, this.verbose), `\n# thirth: mount /${dir} rw in ${this.settings.work_dir.merged}`);
+                        cmds.push(await rexec(`mount -t overlay overlay -o lowerdir=${this.settings.work_dir.lowerdir}/${dir},upperdir=${this.settings.work_dir.upperdir}/${dir},workdir=${this.settings.work_dir.workdir}/${dir} ${this.settings.work_dir.merged}/${dir}`, this.verbose));
                     }
                     else if (this.merged(dir)) {
                         /*
                          * merged creazione della directory e mount ro
                          */
                         cmds.push(`${cmd} need to be present, mount ro`, titleLine);
-                        cmds.push(await makeIfNotExist(`${this.settings.work_dir.merged}/${dir}`, verbose));
-                        cmds.push(await rexec(`mount --bind --make-slave /${dir} ${this.settings.work_dir.merged}/${dir}`, verbose));
-                        cmds.push(await rexec(`mount -o remount,bind,ro ${this.settings.work_dir.merged}/${dir}`, verbose));
+                        cmds.push(await makeIfNotExist(`${this.settings.work_dir.merged}/${dir}`, this.verbose));
+                        cmds.push(await rexec(`mount --bind --make-slave /${dir} ${this.settings.work_dir.merged}/${dir}`, this.verbose));
+                        cmds.push(await rexec(`mount -o remount,bind,ro ${this.settings.work_dir.merged}/${dir}`, this.verbose));
                     }
                     else {
                         /**
                          * normal solo la creazione della directory, nessun mount
                          */
                         cmds.push(`${cmd} need to be present, no mount`, titleLine);
-                        cmds.push(await makeIfNotExist(`${this.settings.work_dir.merged}/${dir}`, verbose), `# mount -o bind /${dir} ${this.settings.work_dir.merged}/${dir}`);
+                        cmds.push(await makeIfNotExist(`${this.settings.work_dir.merged}/${dir}`, this.verbose), `# mount -o bind /${dir} ${this.settings.work_dir.merged}/${dir}`);
                     }
                 }
             }
             else if (n8_1.default.isFile(dir)) {
                 cmds.push(`# /${dir} is just a file`, titleLine);
                 if (!fs.existsSync(`${this.settings.work_dir.merged}/${dir}`)) {
-                    cmds.push(await rexec(`cp /${dir} ${this.settings.work_dir.merged}`, verbose));
+                    cmds.push(await rexec(`cp /${dir} ${this.settings.work_dir.merged}`, this.verbose));
                 }
                 else {
                     cmds.push('# file exist... skip');
@@ -811,7 +781,7 @@ class Ovary {
                         cmds.push(`ln -s ${this.settings.work_dir.merged}/${lnkDest} ${this.settings.work_dir.merged}/${lnkDest}`);
                     }
                     else {
-                        cmds.push(await rexec(`cp -r /${dir} ${this.settings.work_dir.merged}`, verbose));
+                        cmds.push(await rexec(`cp -r /${dir} ${this.settings.work_dir.merged}`, this.verbose));
                     }
                 }
                 else {
@@ -826,9 +796,8 @@ class Ovary {
      * ubind del fs live
      * @param verbose
      */
-    async uBindLiveFs(verbose = false) {
-        const echo = utils_2.default.setEcho(verbose);
-        if (verbose) {
+    async uBindLiveFs() {
+        if (this.verbose) {
             console.log('ovary: uBindLiveFs');
         }
         const cmds = [];
@@ -846,11 +815,11 @@ class Ovary {
                     cmds.push(`\n# directory: ${dirname}`);
                     if (this.mergedAndOvelay(dirname)) {
                         cmds.push(`\n# ${dirname} has overlay`, `\n# First, umount it from ${this.settings.work_dir.path}`);
-                        cmds.push(await rexec(`umount ${this.settings.work_dir.merged}/${dirname}`, verbose), `\n# Second, umount it from ${this.settings.work_dir.lowerdir}`);
-                        cmds.push(await rexec(`umount ${this.settings.work_dir.lowerdir}/${dirname}`, verbose));
+                        cmds.push(await rexec(`umount ${this.settings.work_dir.merged}/${dirname}`, this.verbose), `\n# Second, umount it from ${this.settings.work_dir.lowerdir}`);
+                        cmds.push(await rexec(`umount ${this.settings.work_dir.lowerdir}/${dirname}`, this.verbose));
                     }
                     else if (this.merged(dirname)) {
-                        cmds.push(await rexec(`umount ${this.settings.work_dir.merged}/${dirname}`, verbose));
+                        cmds.push(await rexec(`umount ${this.settings.work_dir.merged}/${dirname}`, this.verbose));
                     }
                     cmds.push(`\n# remove in ${this.settings.work_dir.merged} and ${this.settings.work_dir.lowerdir}`);
                     /**
@@ -858,16 +827,16 @@ class Ovary {
                      */
                     let nest = this.settings.work_dir.path.split('/');
                     if (dirname !== nest[1]) { // We can't remove first level nest
-                        cmds.push(await rexec(`rm ${this.settings.work_dir.merged}/${dirname} -rf`, verbose));
+                        cmds.push(await rexec(`rm ${this.settings.work_dir.merged}/${dirname} -rf`, this.verbose));
                     }
                 }
                 else if (n8_1.default.isFile(dirname)) {
                     cmds.push(`\n# ${dirname} = file`);
-                    cmds.push(await rexec(`rm ${this.settings.work_dir.merged}/${dirname}`, verbose));
+                    cmds.push(await rexec(`rm ${this.settings.work_dir.merged}/${dirname}`, this.verbose));
                 }
                 else if (n8_1.default.isSymbolicLink(dirname)) {
                     cmds.push(`\n# ${dirname} = symbolicLink`);
-                    cmds.push(await rexec(`rm ${this.settings.work_dir.merged}/${dirname}`, verbose));
+                    cmds.push(await rexec(`rm ${this.settings.work_dir.merged}/${dirname}`, this.verbose));
                 }
             }
         }
@@ -876,7 +845,7 @@ class Ovary {
     /**
      * bind dei virtual file system
      */
-    async bindVfs(verbose = false) {
+    async bindVfs() {
         const cmds = [];
         cmds.push(`mount -o bind /dev ${this.settings.work_dir.merged}/dev`, `mount -o bind /dev/pts ${this.settings.work_dir.merged}/dev/pts`, `mount -o bind /proc ${this.settings.work_dir.merged}/proc`, `mount -o bind /sys ${this.settings.work_dir.merged}/sys`, `mount -o bind /run ${this.settings.work_dir.merged}/run`);
         utils_2.default.writeXs(`${this.settings.work_dir.path}bindvfs`, cmds);
@@ -885,7 +854,7 @@ class Ovary {
      *
      * @param verbose
      */
-    async ubindVfs(verbose = false) {
+    async ubindVfs() {
         const cmds = [];
         cmds.push(`umount ${this.settings.work_dir.merged}/dev/pts`, `umount ${this.settings.work_dir.merged}/dev`, `umount ${this.settings.work_dir.merged}/proc`, `umount ${this.settings.work_dir.merged}/run`, `umount ${this.settings.work_dir.merged}/sys`);
         utils_2.default.writeXs(`${this.settings.work_dir.path}ubindvfs`, cmds);
@@ -894,22 +863,21 @@ class Ovary {
      *
      * @param verbose
      */
-    async cleanUsersAccounts(verbose = false) {
-        const echo = utils_2.default.setEcho(verbose);
+    async cleanUsersAccounts() {
         /**
          * delete all user in chroot
          */
         const cmds = [];
         const cmd = `chroot ${this.settings.work_dir.merged} getent passwd {1000..60000} |awk -F: '{print $1}'`;
         const result = await (0, utils_1.exec)(cmd, {
-            echo: verbose,
+            echo: this.verbose,
             ignore: false,
             capture: true
         });
         const users = result.data.split('\n');
         for (let i = 0; i < users.length - 1; i++) {
             // cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} deluser ${users[i]}`, verbose))
-            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} userdel ${users[i]}`, verbose));
+            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} userdel ${users[i]}`, this.verbose));
         }
     }
     /**
@@ -917,50 +885,48 @@ class Ovary {
      * create la home per user_opt
      * @param verbose
      */
-    async createUserLive(verbose = false) {
-        const echo = utils_2.default.setEcho(verbose);
-        if (verbose) {
+    async createUserLive() {
+        if (this.verbose) {
             console.log('ovary: createUserLive');
         }
         const cmds = [];
-        cmds.push(await rexec('chroot ' + this.settings.work_dir.merged + ' rm /home/' + this.settings.config.user_opt + ' -rf', verbose));
-        cmds.push(await rexec('chroot ' + this.settings.work_dir.merged + ' mkdir /home/' + this.settings.config.user_opt, verbose));
-        cmds.push(await rexec('chroot ' + this.settings.work_dir.merged + ' useradd ' + this.settings.config.user_opt + ' --home-dir /home/' + this.settings.config.user_opt + ' --shell /bin/bash ', verbose));
-        cmds.push(await rexec('chroot ' + this.settings.work_dir.merged + ' echo ' + this.settings.config.user_opt + ':' + this.settings.config.user_opt_passwd + '| chroot ' + this.settings.work_dir.merged + ' chpasswd', verbose));
-        cmds.push(await rexec('chroot  ' + this.settings.work_dir.merged + ' cp /etc/skel/. /home/' + this.settings.config.user_opt + ' -R', verbose));
+        cmds.push(await rexec('chroot ' + this.settings.work_dir.merged + ' rm /home/' + this.settings.config.user_opt + ' -rf', this.verbose));
+        cmds.push(await rexec('chroot ' + this.settings.work_dir.merged + ' mkdir /home/' + this.settings.config.user_opt, this.verbose));
+        cmds.push(await rexec('chroot ' + this.settings.work_dir.merged + ' useradd ' + this.settings.config.user_opt + ' --home-dir /home/' + this.settings.config.user_opt + ' --shell /bin/bash ', this.verbose));
+        cmds.push(await rexec('chroot ' + this.settings.work_dir.merged + ' echo ' + this.settings.config.user_opt + ':' + this.settings.config.user_opt_passwd + '| chroot ' + this.settings.work_dir.merged + ' chpasswd', this.verbose));
+        cmds.push(await rexec('chroot  ' + this.settings.work_dir.merged + ' cp /etc/skel/. /home/' + this.settings.config.user_opt + ' -R', this.verbose));
         // cmds.push(await rexec('chroot  ' + this.settings.work_dir.merged + ' cp /etc/skel/. /home/' + this.settings.config.user_opt + ' -R', verbose))
-        cmds.push(await rexec('chroot  ' + this.settings.work_dir.merged + ' chown ' + this.settings.config.user_opt + ':users' + ' /home/' + this.settings.config.user_opt + ' -R', verbose));
+        cmds.push(await rexec('chroot  ' + this.settings.work_dir.merged + ' chown ' + this.settings.config.user_opt + ':users' + ' /home/' + this.settings.config.user_opt + ' -R', this.verbose));
         if (this.familyId === 'debian') {
             // add user live to sudo
-            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG sudo ${this.settings.config.user_opt}`, verbose));
+            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG sudo ${this.settings.config.user_opt}`, this.verbose));
             // educaandos
-            if (this.theme === 'educaandos') {
-                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG adm ${this.settings.config.user_opt}`, verbose));
-                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG cdrom ${this.settings.config.user_opt}`, verbose));
-                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG dip ${this.settings.config.user_opt}`, verbose));
-                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG plugdev ${this.settings.config.user_opt}`, verbose));
-                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG lpadmin ${this.settings.config.user_opt}`, verbose));
-                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG sambashare ${this.settings.config.user_opt}`, verbose));
-                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG admin ${this.settings.config.user_opt}`, verbose));
+            if (this.settings.config.theme === 'educaandos') {
+                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG adm ${this.settings.config.user_opt}`, this.verbose));
+                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG cdrom ${this.settings.config.user_opt}`, this.verbose));
+                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG dip ${this.settings.config.user_opt}`, this.verbose));
+                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG plugdev ${this.settings.config.user_opt}`, this.verbose));
+                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG lpadmin ${this.settings.config.user_opt}`, this.verbose));
+                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG sambashare ${this.settings.config.user_opt}`, this.verbose));
+                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG admin ${this.settings.config.user_opt}`, this.verbose));
             }
         }
         else if (this.familyId === 'archlinux') {
             // adduser live to wheel and autologin
-            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG wheel ${this.settings.config.user_opt}`, verbose));
+            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG wheel ${this.settings.config.user_opt}`, this.verbose));
             // in manjaro they use autologin group for the iso, if not exist create it
-            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} test $(grep "autologin" /etc/group) || groupadd -r autologin`, verbose));
-            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG autologin ${this.settings.config.user_opt}`, verbose));
+            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} test $(grep "autologin" /etc/group) || groupadd -r autologin`, this.verbose));
+            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG autologin ${this.settings.config.user_opt}`, this.verbose));
         }
         if (this.familyId === 'debian' || this.familyId === 'archlinux') {
-            cmds.push(await rexec('chroot ' + this.settings.work_dir.merged + ' echo root:' + this.settings.config.root_passwd + '| chroot ' + this.settings.work_dir.merged + ' chpasswd', verbose));
+            cmds.push(await rexec('chroot ' + this.settings.work_dir.merged + ' echo root:' + this.settings.config.root_passwd + '| chroot ' + this.settings.work_dir.merged + ' chpasswd', this.verbose));
         }
     }
     /**
      *
      */
-    async createXdgAutostart(theme = 'eggs', myAddons, verbose = false) {
-        const echo = utils_2.default.setEcho(verbose);
-        if (verbose) {
+    async createXdgAutostart(theme = 'eggs', myAddons) {
+        if (this.verbose) {
             console.log('ovary: createXdgAutostart()');
         }
         const pathHomeLive = `/home/${this.settings.config.user_opt}`;
@@ -1002,9 +968,14 @@ class Ovary {
         }
         // pve
         if (myAddons.pve) {
-            // Imposto service pve-lite
+            /**
+             * create service pve-live
+             */
             const pve = new pve_live_1.default();
             pve.create(this.settings.work_dir.merged);
+            /**
+             * adding a desktop link for pve
+             */
             const dirAddon = node_path_1.default.resolve(__dirname, '../../addons/eggs/pve');
             shelljs_1.default.cp(`${dirAddon}/artwork/eggs-pve.png`, `${this.settings.work_dir.merged}/usr/share/icons/`);
             shelljs_1.default.cp(`${dirAddon}/applications/eggs-pve.desktop`, `${this.settings.work_dir.merged}/usr/share/applications/`);
@@ -1069,7 +1040,7 @@ class Ovary {
                 text += `test -f "$DESKTOP/install-debian.desktop" && gio set "$DESKTOP/install-debian.desktop" metadata::trusted true\n`;
             }
             fs.writeFileSync(script, text, 'utf8');
-            await (0, utils_1.exec)(`chmod a+x ${script}`, echo);
+            await (0, utils_1.exec)(`chmod a+x ${script}`, this.echo);
         }
         await xdg_1.default.autologin(utils_2.default.getPrimaryUser(), this.settings.config.user_opt, this.settings.work_dir.merged);
     }
@@ -1112,15 +1083,14 @@ class Ovary {
      * makeEfi
     */
     // #######################################################################################
-    async makeEfi(theme = 'eggs', verbose = false) {
-        const echo = utils_2.default.setEcho(verbose);
-        if (verbose) {
+    async makeEfi(theme = 'eggs') {
+        if (this.verbose) {
             console.log('ovary: makeEfi');
         }
         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
          */
@@ -1133,12 +1103,12 @@ class Ovary {
          * Creo o cancello e creo: memdiskDir
          */
         if (fs.existsSync(memdiskDir)) {
-            await (0, utils_1.exec)(`rm ${memdiskDir} -rf`, echo);
+            await (0, utils_1.exec)(`rm ${memdiskDir} -rf`, this.echo);
         }
         utils_2.default.warning('creating memdiskDir: ' + memdiskDir);
         await (0, utils_1.exec)(`mkdir ${memdiskDir}`);
-        await (0, utils_1.exec)(`mkdir ${memdiskDir}/boot`, echo);
-        await (0, utils_1.exec)(`mkdir ${memdiskDir}/boot/grub`, echo);
+        await (0, utils_1.exec)(`mkdir ${memdiskDir}/boot`, this.echo);
+        await (0, utils_1.exec)(`mkdir ${memdiskDir}/boot/grub`, this.echo);
         /**
          * for initial grub.cfg in memdisk
          */
@@ -1153,15 +1123,15 @@ class Ovary {
          * start with empty efiWorkDir
          */
         if (fs.existsSync(efiWorkDir)) {
-            await (0, utils_1.exec)(`rm ${efiWorkDir} -rf`, echo);
+            await (0, utils_1.exec)(`rm ${efiWorkDir} -rf`, this.echo);
         }
         utils_2.default.warning('creating efiWordDir: ' + efiWorkDir);
-        await (0, utils_1.exec)(`mkdir ${efiWorkDir}`, echo);
-        await (0, utils_1.exec)(`mkdir ${efiWorkDir}/boot`, echo);
-        await (0, utils_1.exec)(`mkdir ${efiWorkDir}/boot/grub`, echo);
-        await (0, utils_1.exec)(`mkdir ${efiWorkDir}/boot/grub/${utils_2.default.machineUEFI()}`, echo);
-        await (0, utils_1.exec)(`mkdir ${efiWorkDir}/efi`, echo);
-        await (0, utils_1.exec)(`mkdir ${efiWorkDir}/efi/boot`, echo);
+        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);
+        await (0, utils_1.exec)(`mkdir ${efiWorkDir}/boot/grub/${utils_2.default.machineUEFI()}`, this.echo);
+        await (0, utils_1.exec)(`mkdir ${efiWorkDir}/efi`, this.echo);
+        await (0, utils_1.exec)(`mkdir ${efiWorkDir}/efi/boot`, this.echo);
         /**
         * copy splash to efiWorkDir
         */
@@ -1171,7 +1141,7 @@ class Ovary {
             utils_2.default.warning('Cannot find: ' + splashSrc);
             process.exit();
         }
-        await (0, utils_1.exec)(`cp ${splashSrc} ${splashDest}`);
+        await (0, utils_1.exec)(`cp ${splashSrc} ${splashDest}`, this.echo);
         /**
          * copy theme
          */
@@ -1181,17 +1151,17 @@ class Ovary {
             utils_2.default.warning('Cannot find: ' + themeSrc);
             process.exit();
         }
-        await (0, utils_1.exec)(`cp ${themeSrc} ${themeDest}`);
+        await (0, utils_1.exec)(`cp ${themeSrc} ${themeDest}`, this.echo);
         /**
          * second grub.cfg file in efiWork
          */
         //         for i in $(ls /usr/lib/grub/x86_64-efi            |grep part_|grep \.mod|sed 's/.mod//'); do echo "insmod $i" >>              boot/grub/x86_64-efi/grub.cfg; done
         let cmd = `for i in $(ls /usr/lib/grub/${utils_2.default.machineUEFI()}|grep part_|grep \.mod|sed 's/.mod//'); do echo "insmod $i" >> ${efiWorkDir}boot/grub/${utils_2.default.machineUEFI()}/grub.cfg; done`;
-        await (0, utils_1.exec)(cmd, echo);
+        await (0, utils_1.exec)(cmd, this.echo);
         //     for i in efi_gop efi_uga ieee1275_fb vbe vga video_bochs video_cirrus jpeg png gfxterm ; do echo "insmod $i" >> boot/grub/x86_64-efi/grub.cfg ; done
         cmd = `for i in efi_gop efi_uga ieee1275_fb vbe vga video_bochs video_cirrus jpeg png gfxterm ; do echo "insmod $i" >> ${efiWorkDir}/boot/grub/${utils_2.default.machineUEFI()}/grub.cfg ; done`;
-        await (0, utils_1.exec)(cmd, echo);
-        await (0, utils_1.exec)(`echo "source /boot/grub/grub.cfg" >> ${efiWorkDir}/boot/grub/${utils_2.default.machineUEFI()}/grub.cfg`, echo);
+        await (0, utils_1.exec)(cmd, this.echo);
+        await (0, utils_1.exec)(`echo "source /boot/grub/grub.cfg" >> ${efiWorkDir}/boot/grub/${utils_2.default.machineUEFI()}/grub.cfg`, this.echo);
         /**
          * andiamo in memdiskDir
          */
@@ -1202,7 +1172,7 @@ class Ovary {
          */
         const currentDir = process.cwd();
         process.chdir(memdiskDir);
-        await (0, utils_1.exec)(`tar -cvf memdisk boot`, echo);
+        await (0, utils_1.exec)(`tar -cvf memdisk boot`, this.echo);
         process.chdir(currentDir);
         // make the grub image
         // -O, --format=FORMAT
@@ -1211,41 +1181,41 @@ class Ovary {
         // -p, --prefix=DIR set prefix directory
         //                               --format=x86_64-efi         --memdisk=memdisk          --output=bootx64.efi           --prefix?DIR set prefix directory
         //          grub-mkimage         -O "x86_64-efi"             -m "memdisk"               -o "bootx64.efi"               -p '(memdisk)/boot/grub' search iso9660 configfile normal memdisk tar cat part_msdos part_gpt fat ext2 ntfs ntfscomp hfsplus chain boot linux
-        await (0, utils_1.exec)(`${grubName}-mkimage  -O "${utils_2.default.machineUEFI()}" -m "${memdiskDir}/memdisk" -o "${memdiskDir}/bootx64.efi" -p '(memdisk)/boot/grub' search iso9660 configfile normal memdisk tar cat part_msdos part_gpt fat ext2 ntfs ntfscomp hfsplus chain boot linux`, echo);
+        await (0, utils_1.exec)(`${grubName}-mkimage  -O "${utils_2.default.machineUEFI()}" -m "${memdiskDir}/memdisk" -o "${memdiskDir}/bootx64.efi" -p '(memdisk)/boot/grub' search iso9660 configfile normal memdisk tar cat part_msdos part_gpt fat ext2 ntfs ntfscomp hfsplus chain boot linux`, this.echo);
         // popd torna in efiWorkDir
         // copy the grub image to efi/boot (to go later in the device's root)
-        await (0, utils_1.exec)(`cp ${memdiskDir}/bootx64.efi ${efiWorkDir}/efi/boot`, echo);
+        await (0, utils_1.exec)(`cp ${memdiskDir}/bootx64.efi ${efiWorkDir}/efi/boot`, this.echo);
         // #######################
         // Do the boot image "boot/grub/efiboot.img"
-        await (0, utils_1.exec)(`dd if=/dev/zero of=${efiWorkDir}/boot/grub/efiboot.img bs=1K count=1440`, echo);
-        await (0, utils_1.exec)(`/sbin/mkdosfs -F 12 ${efiWorkDir}/boot/grub/efiboot.img`, echo);
-        await (0, utils_1.exec)(`mkdir ${efiWorkDir}/img-mnt`, echo);
-        await (0, utils_1.exec)(`mount -o loop ${efiWorkDir}/boot/grub/efiboot.img ${efiWorkDir}/img-mnt`, echo);
-        await (0, utils_1.exec)(`mkdir ${efiWorkDir}/img-mnt/efi`, echo);
-        await (0, utils_1.exec)(`mkdir ${efiWorkDir}/img-mnt/efi/boot`, echo);
+        await (0, utils_1.exec)(`dd if=/dev/zero of=${efiWorkDir}/boot/grub/efiboot.img bs=1K count=1440`, this.echo);
+        await (0, utils_1.exec)(`/sbin/mkdosfs -F 12 ${efiWorkDir}/boot/grub/efiboot.img`, this.echo);
+        await (0, utils_1.exec)(`mkdir ${efiWorkDir}/img-mnt`, this.echo);
+        await (0, utils_1.exec)(`mount -o loop ${efiWorkDir}/boot/grub/efiboot.img ${efiWorkDir}/img-mnt`, this.echo);
+        await (0, utils_1.exec)(`mkdir ${efiWorkDir}/img-mnt/efi`, this.echo);
+        await (0, utils_1.exec)(`mkdir ${efiWorkDir}/img-mnt/efi/boot`, this.echo);
         // era cp -r
-        await (0, utils_1.exec)(`cp ${memdiskDir}/bootx64.efi ${efiWorkDir}/img-mnt/efi/boot`, echo);
+        await (0, utils_1.exec)(`cp ${memdiskDir}/bootx64.efi ${efiWorkDir}/img-mnt/efi/boot`, this.echo);
         // #######################
         // copy modules and font
-        await (0, utils_1.exec)(`cp -r /usr/lib/grub/${utils_2.default.machineUEFI()}/* ${efiWorkDir}/boot/grub/${utils_2.default.machineUEFI()}/`, echo);
+        await (0, utils_1.exec)(`cp -r /usr/lib/grub/${utils_2.default.machineUEFI()}/* ${efiWorkDir}/boot/grub/${utils_2.default.machineUEFI()}/`, this.echo);
         // if this doesn't work try another font from the same place (grub's default, unicode.pf2, is much larger)
         // Either of these will work, and they look the same to me. Unicode seems to work with qemu. -fsr
         if (fs.existsSync('/usr/share/grub/unicode.pf2')) {
-            await (0, utils_1.exec)(`cp /usr/share/grub/unicode.pf2 ${efiWorkDir}/boot/grub/font.pf2`, echo);
+            await (0, utils_1.exec)(`cp /usr/share/grub/unicode.pf2 ${efiWorkDir}/boot/grub/font.pf2`, this.echo);
         }
         else if (fs.existsSync('/usr/share/grub2/ascii.pf2')) {
-            await (0, utils_1.exec)(`cp /usr/share/grub2/ascii.pf2 ${efiWorkDir}/boot/grub/font.pf2`, echo);
+            await (0, utils_1.exec)(`cp /usr/share/grub2/ascii.pf2 ${efiWorkDir}/boot/grub/font.pf2`, this.echo);
         }
         // doesn't need to be root-owned
         // chown -R 1000:1000 $(pwd) 2>/dev/null
         // Cleanup efi temps
-        await (0, utils_1.exec)(`umount ${efiWorkDir}/img-mnt`, echo);
+        await (0, utils_1.exec)(`umount ${efiWorkDir}/img-mnt`, this.echo);
         // await exec(`rmdir ${efiWorkDir}/img-mnt`, echo)
         // await exec(`rm ${memdiskDir}/img-mnt -rf`, echo)
         //  popd
         // Copy efi files to iso
-        await (0, utils_1.exec)(`rsync -avx  ${efiWorkDir}/boot ${isoDir}/`, echo);
-        await (0, utils_1.exec)(`rsync -avx ${efiWorkDir}/efi  ${isoDir}/`, echo);
+        await (0, utils_1.exec)(`rsync -avx  ${efiWorkDir}/boot ${isoDir}/`, this.echo);
+        await (0, utils_1.exec)(`rsync -avx ${efiWorkDir}/efi  ${isoDir}/`, this.echo);
         // Do the main grub.cfg (which gets loaded last):
         // grub.theme.cfg
         const grubThemeSrc = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/grub.theme.cfg`);
@@ -1271,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 = {
@@ -1294,7 +1264,7 @@ class Ovary {
      * create .disk/info, .disk/mksquashfs, .disk/mkiso
      * return mkiso
      */
-    makeDotDisk(backup = false, verbose = false) {
+    makeDotDisk(backup = false) {
         const dotDisk = this.settings.work_dir.pathIso + '/.disk';
         if (fs.existsSync(dotDisk)) {
             shelljs_1.default.rm('-rf', dotDisk);
@@ -1328,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';
@@ -1388,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
          *
@@ -1454,16 +1425,14 @@ class Ovary {
      * makeIso
      * cmd: cmd 4 xorirriso
      */
-    async makeIso(cmd, scriptOnly = false, verbose = false) {
-        let echo = { echo: false, ignore: false };
-        if (verbose) {
-            echo = { echo: true, ignore: false };
+    async makeIso(cmd, scriptOnly = false) {
+        //echo = { echo: true, ignore: false }
+        if (this.verbose) {
             console.log('ovary: makeIso');
         }
-        console.log(cmd);
         utils_2.default.writeX(`${this.settings.work_dir.path}mkisofs`, cmd);
         if (!scriptOnly) {
-            await (0, utils_1.exec)(cmd, echo);
+            await (0, utils_1.exec)(cmd, utils_2.default.setEcho(true));
         }
     }
     /**