penguins-eggs 9.5.22 → 9.5.24

package/dist/classes/ovary.js

@@ -1,9 +1,10 @@
 "use strict";
 /**
- * penguins-eggs: ovary.ts
+ * penguins-eggs
+ * class: ovary.ts
  * author: Piero Proietti
- * mail: piero.proietti@gmail.com
- *
+ * email: piero.proietti@gmail.com
+ * license: MIT
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
@@ -166,6 +167,7 @@ class Ovary {
              * put reCreate = true in release
              */
             const reCreate = true;
+            let mksquashfsCmd = '';
             if (reCreate) { // start pre-clone
                 /**
                  * installer
@@ -213,7 +215,7 @@ class Ovary {
                     this.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(clone, cryptedclone);
-                await this.makeSquashfs(scriptOnly);
+                mksquashfsCmd = await this.makeSquashfs(scriptOnly);
                 await this.uBindLiveFs(); // Lo smonto prima della fase di backup
             }
             if (cryptedclone) {
@@ -223,38 +225,37 @@ class Ovary {
                 utils_2.default.warning(`moving ${luksFile} in ${this.ovarium}iso/live`);
                 await (0, utils_1.exec)(`mv ${luksFile} ${this.ovarium}iso/live`, this.echo);
             }
-            const xorrisoCommand = this.makeDotDisk(clone, cryptedclone);
+            const mkIsofsCmd = this.xorrisoCommand(clone, cryptedclone).replace(/\s\s+/g, ' ');
+            const info = utils_2.default.getVolid(this.settings.remix.name);
+            this.makeDotDisk(info, mksquashfsCmd, mkIsofsCmd);
             /**
              * patch to emulate miso/archiso on archilinux
              */
             if (this.familyId === 'archlinux') {
+                let pathName = `arch/x86_64/airootfs`;
+                let hashCmd = 'sha512sum';
+                let hashExt = '.sha512';
                 if (this.settings.distro.distroId === 'ManjaroLinux') {
-                    await (0, utils_1.exec)(`mkdir ${this.settings.iso_work}manjaro/x86_64 -p`, this.echo);
-                    await (0, utils_1.exec)(`ln ${this.settings.iso_work}live/filesystem.squashfs ${this.settings.iso_work}manjaro/x86_64/livefs.sfs`, this.echo);
-                    await (0, utils_1.exec)(`md5sum ${this.settings.iso_work}live/filesystem.squashfs > ${this.settings.iso_work}manjaro/x86_64/livefs.md5`, this.echo);
-                }
-                else if (this.settings.distro.distroId === 'Arch' ||
-                    this.settings.distro.distroId === 'blendOS' ||
-                    this.settings.distro.distroId === 'Garuda' ||
-                    this.settings.distro.distroId === 'phyOS' ||
-                    this.settings.distro.distroId === 'RebornOS' ||
-                    this.settings.distro.distroId === 'EndeavourOS') {
-                    await (0, utils_1.exec)(`mkdir ${this.settings.iso_work}arch/x86_64 -p`, this.echo);
-                    await (0, utils_1.exec)(`ln ${this.settings.iso_work}live/filesystem.squashfs          ${this.settings.iso_work}arch/x86_64/airootfs.sfs`, this.echo);
-                    await (0, utils_1.exec)(`sha512sum ${this.settings.iso_work}live/filesystem.squashfs > ${this.settings.iso_work}arch/x86_64/airootfs.sha512`, this.echo);
+                    pathName = `manjaro/x86_64/livefs`;
+                    hashCmd = `md5sum`;
+                    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);
             }
-            await this.makeIso(xorrisoCommand, scriptOnly);
+            await this.makeIso(mkIsofsCmd, scriptOnly);
         }
     }
     /**
      * Crea la struttura della workdir
      */
     async liveCreateStructure() {
-        // efi-work iso  memdiskDir sotto mountpoint
         if (this.verbose) {
             console.log('Ovary: liveCreateStructure');
         }
+        // efi-work iso  memdiskDir sotto mountpoint
         utils_2.default.warning(`Creating egg in ${this.settings.config.snapshot_dir}`);
         let cmd;
         if (!fs_1.default.existsSync(this.settings.config.snapshot_dir)) {
@@ -285,11 +286,11 @@ class Ovary {
          * Creo le directory di destinazione per boot, efi, isolinux e live
          */
         if (!fs_1.default.existsSync(this.settings.iso_work)) {
-            cmd = `mkdir -p ${this.settings.iso_work}/boot/grub/${utils_2.default.machineUEFI()}`;
+            cmd = `mkdir -p ${this.settings.iso_work}boot/grub/${utils_2.default.machineUEFI()}`;
             this.tryCatch(cmd);
-            cmd = `mkdir -p ${this.settings.iso_work}/efi/boot`;
+            cmd = `mkdir -p ${this.settings.iso_work}efi/boot`;
             this.tryCatch(cmd);
-            cmd = `mkdir -p ${this.settings.iso_work}/isolinux`;
+            cmd = `mkdir -p ${this.settings.iso_work}isolinux`;
             this.tryCatch(cmd);
             cmd = `mkdir -p ${this.settings.iso_work}live`;
             this.tryCatch(cmd);
@@ -300,6 +301,9 @@ class Ovary {
      * @param cmd
      */
     async tryCatch(cmd = '') {
+        if (this.verbose) {
+            console.log('Ovary: tryCatch');
+        }
         try {
             await (0, utils_1.exec)(cmd, this.echo);
         }
@@ -320,7 +324,7 @@ class Ovary {
      */
     async editLiveFs(clone = false, cryptedclone = false) {
         if (this.verbose) {
-            console.log('ovary: editLiveFs');
+            console.log('Ovary: editLiveFs');
         }
         /**
          * /etc/penguins-eggs.d/is_clone file created on live
@@ -528,8 +532,7 @@ class Ovary {
      */
     async syslinux() {
         if (this.verbose) {
-            console.log('ovary: syslinux');
-            console.log('syslinux path: ' + this.settings.distro.syslinuxPath);
+            console.log('Ovary: syslinux');
         }
         await (0, utils_1.exec)(`cp ${this.settings.distro.syslinuxPath}/vesamenu.c32 ${this.settings.iso_work}/isolinux/`, this.echo);
         await (0, utils_1.exec)(`cp ${this.settings.distro.syslinuxPath}/chain.c32 ${this.settings.iso_work}/isolinux/`, this.echo);
@@ -549,7 +552,7 @@ class Ovary {
      */
     async isolinux(theme = 'eggs') {
         if (this.verbose) {
-            console.log('ovary: isolinux');
+            console.log('Ovary: isolinux');
         }
         /**
          * isolinux.bin
@@ -606,6 +609,9 @@ class Ovary {
      * @returns kernelParameters
      */
     kernelParameters() {
+        if (this.verbose) {
+            console.log('Ovary: kernelParameters');
+        }
         const distroId = this.settings.distro.distroId;
         let kp = `boot=live components locales=${process.env.LANG}`;
         if (this.familyId === 'archlinux') {
@@ -630,11 +636,11 @@ class Ovary {
      */
     async kernelCopy() {
         if (this.verbose) {
-            console.log('ovary: kernelCopy');
+            console.log('Ovary: kernelCopy');
         }
         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);
+            await (0, utils_1.exec)(`cp ${this.settings.kernel_image} ${this.settings.iso_work}live/`, this.echo);
         }
         else {
             utils_2.default.error(`Cannot find ${this.settings.kernel_image}`);
@@ -650,9 +656,12 @@ class Ovary {
      * necessita di echoYes
      */
     async initrdCreate() {
+        if (this.verbose) {
+            console.log('Ovary: initrdCreate');
+        }
         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/`);
+        utils_2.default.warning(`Creating ${initrdImg} in ${this.settings.iso_work}live/`);
         const distroId = this.settings.distro.distroId;
         let fileConf = 'archlinux';
         if (distroId === 'Arch' ||
@@ -673,13 +682,16 @@ class Ovary {
             fileConf = distroId.toLowerCase();
         }
         let pathConf = node_path_1.default.resolve(__dirname, `../../mkinitcpio/${fileConf}/live.conf`);
-        await (0, utils_1.exec)(`mkinitcpio -c ${pathConf} -g ${this.settings.iso_work}/live/${initrdImg}`, utils_2.default.setEcho(true));
+        await (0, utils_1.exec)(`mkinitcpio -c ${pathConf} -g ${this.settings.iso_work}live/${initrdImg}`, utils_2.default.setEcho(true));
     }
     /**
      * We must upgrade to initrdCreate for Debian/Ubuntu
      * @returns
      */
     async initrdCopy(verbose = false) {
+        if (this.verbose) {
+            console.log('Ovary: initrdCopy');
+        }
         let isCrypted = false;
         utils_2.default.warning('initrdCreate');
         if (fs_1.default.existsSync('/etc/crypttab')) {
@@ -716,7 +728,7 @@ class Ovary {
      */
     async makeSquashfs(scriptOnly = false) {
         if (this.verbose) {
-            console.log('ovary: makeSquashfs');
+            console.log('Ovary: makeSquashfs');
         }
         /**
          * exclude all the accurence of cryptdisks in rc0.d, etc
@@ -764,6 +776,7 @@ class Ovary {
                 process.exit();
             }
         }
+        return cmd;
     }
     /**
      * Restituisce true per le direcory da montare con overlay
@@ -776,7 +789,10 @@ class Ovary {
      *
      * @param dir
      */
-    mergedAndOvelay(dir) {
+    mergedAndOverlay(dir) {
+        if (this.verbose) {
+            console.log('Ovary: mergedAndOverlay');
+        }
         const mountDirs = ['boot', 'etc', 'usr', 'var'];
         let mountDir = '';
         let overlay = false;
@@ -798,6 +814,9 @@ class Ovary {
      * - copied: creazione directory e copia
      */
     merged(dir) {
+        if (this.verbose) {
+            console.log('Ovary: merged');
+        }
         let merged = true;
         if (dir === 'home') {
             merged = this.clone;
@@ -833,7 +852,7 @@ class Ovary {
      */
     async bindLiveFs() {
         if (this.verbose) {
-            console.log('ovary: bindLiveFs');
+            console.log('Ovary: bindLiveFs');
         }
         /**
          * Attenzione:
@@ -855,7 +874,7 @@ class Ovary {
                 if (dir !== 'boot') {
                     if (dir !== 'lost+found') {
                         cmd = `# /${dir} is a directory`;
-                        if (this.mergedAndOvelay(dir)) {
+                        if (this.mergedAndOverlay(dir)) {
                             /**
                              * mergedAndOverlay creazione directory, overlay e mount rw
                              */
@@ -921,9 +940,8 @@ class Ovary {
      */
     async copyBoot() {
         if (this.verbose) {
-            console.log('ovary: copyBoot');
+            console.log('Ovary: copyBoot');
         }
-        console.log('ovary: copyBoot');
         await rexec(`cp -r /boot ${this.settings.config.snapshot_mnt}filesystem.squashfs`, this.verbose);
     }
     /**
@@ -932,7 +950,7 @@ class Ovary {
      */
     async uBindLiveFs() {
         if (this.verbose) {
-            console.log('ovary: uBindLiveFs');
+            console.log('Ovary: uBindLiveFs');
         }
         const cmds = [];
         cmds.push('# NOTE: home, cdrom, dev, live, media, mnt, proc, run, sys and tmp', `#       need just to be removed in ${this.settings.work_dir.merged}`);
@@ -946,7 +964,7 @@ class Ovary {
                 cmds.push('#############################################################');
                 if (n8_1.default.isDirectory(dirname)) {
                     cmds.push(`\n# directory: ${dirname}`);
-                    if (this.mergedAndOvelay(dirname)) {
+                    if (this.mergedAndOverlay(dirname)) {
                         cmds.push(`\n# ${dirname} has overlay`, `\n# First, umount it from ${this.settings.config.snapshot_dir}`);
                         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));
@@ -983,6 +1001,9 @@ class Ovary {
      * bind dei virtual file system
      */
     async bindVfs() {
+        if (this.verbose) {
+            console.log('Ovary: 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.writeXs(`${this.settings.config.snapshot_dir}bindvfs`, cmds)
@@ -993,6 +1014,9 @@ class Ovary {
      * @param verbose
      */
     async ubindVfs() {
+        if (this.verbose) {
+            console.log('Ovary: 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.writeXs(`${this.settings.config.snapshot_dir}ubindvfs`, cmds)
@@ -1003,6 +1027,9 @@ class Ovary {
      * @param verbose
      */
     async cleanUsersAccounts() {
+        if (this.verbose) {
+            console.log('Ovary: cleanUsersAccounts');
+        }
         /**
          * delete all user in chroot
          */
@@ -1026,13 +1053,14 @@ class Ovary {
      */
     async createUserLive() {
         if (this.verbose) {
-            console.log('ovary: createUserLive');
+            console.log('Ovary: createUserLive');
         }
         const cmds = [];
         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 + ' cp /etc/skel/. /home/' + this.settings.config.user_opt + ' -R', this.verbose));
+        // da problemi con il mount sshfs
         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));
         // live password
         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));
@@ -1067,7 +1095,7 @@ class Ovary {
      */
     async createXdgAutostart(theme = 'eggs', myAddons, noicons = false) {
         if (this.verbose) {
-            console.log('ovary: createXdgAutostart()');
+            console.log('Ovary: createXdgAutostart');
         }
         const pathHomeLive = `/home/${this.settings.config.user_opt}`;
         if (noicons) { // NO icone
@@ -1204,6 +1232,9 @@ class Ovary {
      * @param icon
      */
     lxdeLink(file, name, icon) {
+        if (this.verbose) {
+            console.log('Ovary: lxdeLink');
+        }
         const lnk = `lnk-${file}`;
         let text = '';
         text += `echo "[Desktop Entry]" >$DESKTOP/${lnk}\n`;
@@ -1219,6 +1250,9 @@ class Ovary {
      * @param exclusion {atring} path to add/remove
      */
     addRemoveExclusion(add, exclusion) {
+        if (this.verbose) {
+            console.log('Ovary: addRemoveExclusion');
+        }
         if (exclusion.startsWith('/')) {
             exclusion = exclusion.slice(1); // remove / initial Non compatible with rsync
         }
@@ -1239,11 +1273,8 @@ class Ovary {
     // #######################################################################################
     async makeEfi(theme = 'eggs') {
         if (this.verbose) {
-            console.log('ovary: makeEfi');
+            console.log('Ovary: makeEfi');
         }
-        // const memdiskDir = this.settings.work_dir.path + 'memdiskDir'
-        // const efiWorkDir = this.settings.efi_work
-        // const isoDir = this.settings.iso_work
         const memdiskDir = this.settings.config.snapshot_mnt + 'memdiskDir';
         const efiWorkDir = this.settings.efi_work;
         const isoDir = this.settings.iso_work;
@@ -1283,15 +1314,15 @@ class Ovary {
         }
         utils_2.default.warning('creating efiWordDir: ' + 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);
-        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);
+        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
         */
-        const splashDest = `${efiWorkDir}/boot/grub/splash.png`;
+        const splashDest = `${efiWorkDir}boot/grub/splash.png`;
         let splashSrc = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/splash.png`);
         if (this.theme.includes('/')) {
             splashSrc = `${theme}/theme/livecd/splash.png`;
@@ -1304,7 +1335,7 @@ class Ovary {
         /**
          * copy theme
          */
-        const themeDest = `${efiWorkDir}/boot/grub/theme.cfg`;
+        const themeDest = `${efiWorkDir}boot/grub/theme.cfg`;
         let themeSrc = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/grub.theme.cfg`);
         if (this.theme.includes('/')) {
             themeSrc = `${theme}/theme/livecd/grub.theme.cfg`;
@@ -1320,10 +1351,10 @@ class Ovary {
         //         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, 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`;
+        //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.machineUEFI()}/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, this.echo);
-        await (0, utils_1.exec)(`echo "source /boot/grub/grub.cfg" >> ${efiWorkDir}/boot/grub/${utils_2.default.machineUEFI()}/grub.cfg`, 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
          */
@@ -1346,41 +1377,41 @@ class Ovary {
         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`, this.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`, 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);
+        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`, this.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()}/`, this.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_1.default.existsSync('/usr/share/grub/font.pf2')) {
-            await (0, utils_1.exec)(`cp /usr/share/grub/font.pf2 ${efiWorkDir}/boot/grub/font.pf2`, this.echo);
+            await (0, utils_1.exec)(`cp /usr/share/grub/font.pf2 ${efiWorkDir}boot/grub/font.pf2`, this.echo);
         }
         else if (fs_1.default.existsSync('/usr/share/grub/unicode.pf2')) {
-            await (0, utils_1.exec)(`cp /usr/share/grub/unicode.pf2 ${efiWorkDir}/boot/grub/font.pf2`, this.echo);
+            await (0, utils_1.exec)(`cp /usr/share/grub/unicode.pf2 ${efiWorkDir}boot/grub/font.pf2`, this.echo);
         }
         else if (fs_1.default.existsSync('/usr/share/grub/ascii.pf2')) {
-            await (0, utils_1.exec)(`cp /usr/share/grub/ascii.pf2 ${efiWorkDir}/boot/grub/font.pf2`, this.echo);
+            await (0, utils_1.exec)(`cp /usr/share/grub/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`, this.echo);
-        await (0, utils_1.exec)(`rmdir ${efiWorkDir}/img-mnt`, this.echo);
+        await (0, utils_1.exec)(`umount ${efiWorkDir}img-mnt`, this.echo);
+        await (0, utils_1.exec)(`rmdir ${efiWorkDir}img-mnt`, this.echo);
         await (0, utils_1.exec)(`rm ${memdiskDir}/img-mnt -rf`, this.echo);
         //  popd
         // Copy efi files to iso
-        await (0, utils_1.exec)(`rsync -avx  ${efiWorkDir}/boot ${isoDir}/`, this.echo);
-        await (0, utils_1.exec)(`rsync -avx ${efiWorkDir}/efi  ${isoDir}/`, this.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
         let grubThemeSrc = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/grub.theme.cfg`);
@@ -1420,26 +1451,24 @@ class Ovary {
     // #######################################################################################
     /**
      * makeDotDisk
-     * create .disk/info, .disk/mksquashfs, .disk/mkiso
-     * return mkiso
      */
-    makeDotDisk(clone = false, cryptedclone = false) {
-        const dotDisk = this.settings.iso_work + '/.disk';
+    makeDotDisk(info = '', mksquashfs = '', mkisofs = '') {
+        if (this.verbose) {
+            console.log('Ovary: makeDotDisk');
+        }
+        const dotDisk = this.settings.iso_work + '.disk';
         if (fs_1.default.existsSync(dotDisk)) {
             shelljs_1.default.rm('-rf', dotDisk);
         }
         shelljs_1.default.mkdir('-p', dotDisk);
+        let text = `# Created at: ${utils_2.default.formatDate(new Date())}\n`;
+        text += `# penguins_eggs v. ${utils_2.default.getPackageVersion()}\n`;
         // .disk/info
-        let file = dotDisk + '/info';
-        let content = utils_2.default.getVolid(this.settings.remix.name);
-        fs_1.default.writeFileSync(file, content, 'utf-8');
+        fs_1.default.writeFileSync(dotDisk + '/info', info, 'utf-8');
         // .disk/mksquashfs
-        shelljs_1.default.cp(this.ovarium + 'mksquashfs', dotDisk + '/mksquashfs');
+        fs_1.default.writeFileSync(dotDisk + '/mksquashfs', text + mksquashfs, 'utf-8');
         // .disk/mkisofs
-        content = this.xorrisoCommand(clone, cryptedclone).replace(/\s\s+/g, ' ');
-        file = dotDisk + '/mkisofs';
-        fs_1.default.writeFileSync(file, content, 'utf-8');
-        return content;
+        fs_1.default.writeFileSync(dotDisk + '/mkisofs', text + mkisofs, 'utf-8');
     }
     /**
      *
@@ -1447,6 +1476,9 @@ class Ovary {
      * @returns cmd 4 mkiso
      */
     xorrisoCommand(clone = false, cryptedclone = false) {
+        if (this.verbose) {
+            console.log('Ovary: xorrisoCommand');
+        }
         const volid = utils_2.default.getVolid(this.settings.remix.name);
         let prefix = this.settings.config.snapshot_prefix;
         if (prefix.endsWith('rolling-')) {
@@ -1600,7 +1632,7 @@ class Ovary {
     async makeIso(cmd, scriptOnly = false) {
         // echo = { echo: true, ignore: false }
         if (this.verbose) {
-            console.log('ovary: makeIso');
+            console.log('Ovary: makeIso');
         }
         //Utils.writeX(`${this.settings.config.snapshot_dir}mkisofs`, cmd)
         utils_2.default.writeX(`${this.settings.work_dir.ovarium}mkisofs`, cmd);
@@ -1644,6 +1676,9 @@ class Ovary {
     * fill
     */
     async usersFill() {
+        if (this.verbose) {
+            console.log('Ovary: usersFill');
+        }
         const usersArray = [];
         await (0, promises_1.access)('/etc/passwd', fs_2.constants.R_OK | fs_2.constants.W_OK);
         const passwd = fs_1.default.readFileSync('/etc/passwd', 'utf-8').split('\n');
@@ -1665,7 +1700,7 @@ exports.default = Ovary;
  */
 async function makeIfNotExist(path, verbose = false) {
     if (verbose) {
-        console.log(`ovary: makeIfNotExist(${path})`);
+        console.log(`Ovary: makeIfNotExist(${path})`);
     }
     const echo = utils_2.default.setEcho(verbose);
     let cmd = `# ${path} alreasy exist`;
@@ -1681,6 +1716,9 @@ async function makeIfNotExist(path, verbose = false) {
  * @param echo
  */
 async function rexec(cmd, verbose = false) {
+    if (verbose) {
+        console.log(`Ovary: rexec(${cmd})`);
+    }
     const echo = utils_2.default.setEcho(verbose);
     const check = await (0, utils_1.exec)(cmd, echo);
     if (!cmd.startsWith('umount')) { // skip umount errors

package/dist/classes/pacman.js

@@ -1,6 +1,7 @@
 "use strict";
 /**
- * penguins-eggs-v8
+ * penguins-eggs
+ * class: pacman.ts
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT

package/dist/classes/pve-live.js

@@ -1,10 +1,10 @@
 "use strict";
 /**
- * penguins-eggss
+ * penguins-eggs
+ * class: pve.ts
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT
- * pve-live
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");

package/dist/classes/pxe.js

@@ -1,11 +1,13 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 /**
- * penguins-eggs: pxe.ts
+ * penguins-eggs
+ * class: pxe.ts
  * author: Piero Proietti
- * mail: piero.proietti@gmail.com
+ * email: piero.proietti@gmail.com
+ * license: MIT
  */
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 const utils_1 = require("../lib/utils");
 const distro_1 = tslib_1.__importDefault(require("./distro"));
 const fs_1 = tslib_1.__importDefault(require("fs"));

package/dist/classes/settings.js

@@ -1,9 +1,10 @@
 "use strict";
 /**
- * penguins-eggs: ovary.ts VERSIONE DEBIAN-LIVE
+ * penguins-eggs
+ * class: settings.ts
  * author: Piero Proietti
- * mail: piero.proietti@gmail.com
- *
+ * email: piero.proietti@gmail.com
+ * license: MIT
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
@@ -178,58 +179,5 @@ class Settings {
         this.remix.fullname = name;
         this.remix.versionName = name.toUpperCase();
     }
-    /**
-    * show NOT USED MORE
-    */
-    async show_not_used_more() {
-        console.log(`application_name:  ${this.app.name} ${this.app.version}`);
-        // console.log(`config_file:       ${config_file}`)
-        console.log(`snapshot_dir:      ${this.config.snapshot_dir}`);
-        if (this.config.snapshot_prefix === '') {
-            console.log('snapshot_prefix:   ' + chalk_1.default.bgYellow('no value') + ' run ' + chalk_1.default.cyan('sudo eggs dad') + ' or edit ' + chalk_1.default.cyan('/etc/penguins-eggs.d/eggs.yaml'));
-        }
-        else {
-            console.log('snapshot_prefix:   ' + chalk_1.default.green(this.config.snapshot_prefix));
-        }
-        console.log(`snapshot_basename: ${this.config.snapshot_basename}`);
-        // console.log(`snapshot_excludes: ${this.config.snapshot_excludes}`)
-        if (node_fs_1.default.existsSync(this.kernel_image)) {
-            console.log('kernel_image:      ' + chalk_1.default.green(this.kernel_image));
-        }
-        else {
-            console.log('kernel_image:      ' + chalk_1.default.red(this.kernel_image) + ' not found! Please edit /etc/penguins-eggs.d/eggs.yaml');
-        }
-        if (node_fs_1.default.existsSync(this.initrd_image)) {
-            console.log('initrd_image:      ' + chalk_1.default.green(this.initrd_image));
-        }
-        else {
-            console.log('initrd_image:      ' + chalk_1.default.red(this.initrd_image) + ' not found! Please edit /etc/penguins-eggs.d/eggs.yaml');
-        }
-        console.log(`snapshot_dir:          ${this.config.snapshot_dir}`);
-        // console.log(`efi_work:          ${this.efi_work}`)
-        // console.log(`make_efi:          ${this.config.make_efi}`)
-        // console.log(`make_md5sum:       ${this.config.make_md5sum}`)
-        // console.log(`make_isohybrid:    ${this.config.make_isohybrid}`)
-        console.log(`compression:       ${this.config.compression}`);
-        // console.log(`force_installer:   ${this.config.force_installer}`)
-        console.log(`user_opt:          ${this.config.user_opt}`);
-        console.log(`locales:           ${this.config.locales}`);
-        console.log(`locale default:    ${this.config.locales_default}`);
-        // console.log(`ssh_pass:          ${this.config.ssh_pass}`)
-        if (this.config.make_efi) {
-            if (!pacman_1.default.isUefi()) {
-                utils_1.default.error('You choose to create an UEFI image, but miss to install grub-efi-amd64-bin package.');
-                utils_1.default.error('Please install it before to create an UEFI image:');
-                utils_1.default.warning('sudo apt install grub-efi-amd64-bin');
-                this.config.make_efi = false;
-            }
-            else if (!pacman_1.default.packageIsInstalled('dosfstools')) {
-                utils_1.default.error('You choose to create an UEFI image, but miss to install dosfstools package.');
-                utils_1.default.error('Please install it before to create an UEFI image:');
-                utils_1.default.warning('sudo apt install dosfstools');
-                this.config.make_efi = false;
-            }
-        }
-    }
 }
 exports.default = Settings;