penguins-eggs 9.1.35 → 9.1.37

package/README.md

@@ -48,7 +48,7 @@ wardrobe was added to eggs on april 2022, it's is a way to guide and consolidate
 
 I hope peoples will be interested in wardrobe and you will end to fork the main repository and add your customizations: together will be possibile to make great steps impossible for a single developer. 
 
-You can read more in wardrobe on [penguin's eggs blog](https://penguins-eggs.net/2022/04/12/wardrobe-colibri-duck-eagle-and-owl/). The results of mine customizations are mostly under [Debian bullseye](https://sourceforge.net/projects/penguins-eggs/files/iso/debian/bullseye/), [Devuan chimaera](https://sourceforge.net/projects/penguins-eggs/files/iso/devuan/chimaera/) and [Ubuntu jammy](https://sourceforge.net/projects/penguins-eggs/files/iso/ubuntu/jammy/) on my sourgeforce page.
+You can read more in wardrobe on [penguin's eggs blog](https://penguins-eggs.net/2022/04/12/wardrobe-colibri-duck-eagle-and-owl/). The results of mine customizations are mostly under [Debian bullseye](https://sourceforge.net/projects/penguins-eggs/files/iso/debian/bullseye/), [Devuan chimaera](ttps://sourceforge.net/projects/penguins-eggs/files/iso/devuan/chimaera/) and [Ubuntu jammy](https://sourceforge.net/projects/penguins-eggs/files/iso/ubuntu/jammy/) on my sourgeforce page.
 
 ### krill
 eggs include a CLI installer named krill, this let you to produce and install servers configurations. krill use a nice TUI interface using the same, configuration created by eggs for [calamares](calamares.io). This lead to have "about the same" experience installing, from old distros to new ones and for GUI and CLI. To force using krill in place of calamares in a GUI system just: **sudo eggs install --cli**
@@ -78,7 +78,7 @@ Or a new installation, can easyly get users and servers data from a luks-eggs-ba
 * ```syncfrom``` replace all users homes and all servers homes with data from the luck-eggs-backup file, Force this data in a not appropriate system can easily end in a long disaster recovery.
 
 ## What distributions can I use?
-eggs was born on Debian strecth, buster and following, actually full support Debian from jessie to bookworm/sid, Devuan beowulf, chimaera, daedalus, Ubuntu bionic, focal, jammy and all derivatives from them, including Linux mint, Deepin, neon KDE, etc. Eggs is able to remaster and install manjaro linux too and derivated, i need help to continue the effort to manjaro.
+eggs was born on Debian strecth, buster and followinng. Actually full support Debian from jessie to bookworm/sid, Devuan beowulf, chimaera, daedalus, Ubuntu bionic, focal, jammy  - and all derivatives from them including Linux mint, Deepin, neon KDE, etc - ManjaroLinux and finally Arch, the last distro added.
 
 You can read more on the [blog](https://penguins-eggs.net/2021/11/02/distros-that-can-be-remastered-with-eggs/), some examples of iso images remastered with eggs are in the [sourceforge page of the project](https://sourceforge.net/projects/penguins-eggs/files/iso/). 
 
@@ -132,7 +132,7 @@ $ npm install -g penguins-eggs
 $ eggs COMMAND
 running command...
 $ eggs (--version|-v)
-penguins-eggs/9.1.35 linux-x64 node-v16.15.1
+penguins-eggs/9.1.37 linux-x64 node-v16.16.0
 $ eggs --help [COMMAND]
 USAGE
   $ eggs COMMAND
@@ -189,7 +189,7 @@ DESCRIPTION
   adapt monitor resolution for VM only
 ```
 
-_See code: [src/commands/adapt.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.35/src/commands/adapt.ts)_
+_See code: [src/commands/adapt.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.37/src/commands/adapt.ts)_
 
 ## `eggs analyze`
 
@@ -210,7 +210,7 @@ EXAMPLES
   $ sudo eggs analyze
 ```
 
-_See code: [src/commands/analyze.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.35/src/commands/analyze.ts)_
+_See code: [src/commands/analyze.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.37/src/commands/analyze.ts)_
 
 ## `eggs autocomplete [SHELL]`
 
@@ -268,7 +268,7 @@ EXAMPLES
   install calamares and create it's configuration's files
 ```
 
-_See code: [src/commands/calamares.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.35/src/commands/calamares.ts)_
+_See code: [src/commands/calamares.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.37/src/commands/calamares.ts)_
 
 ## `eggs config`
 
@@ -292,7 +292,7 @@ EXAMPLES
   Configure and install prerequisites deb packages to run it
 ```
 
-_See code: [src/commands/config.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.35/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.37/src/commands/config.ts)_
 
 ## `eggs dad`
 
@@ -312,7 +312,7 @@ DESCRIPTION
   ask help from daddy - configuration helper
 ```
 
-_See code: [src/commands/dad.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.35/src/commands/dad.ts)_
+_See code: [src/commands/dad.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.37/src/commands/dad.ts)_
 
 ## `eggs export deb`
 
@@ -403,7 +403,7 @@ DESCRIPTION
   informations about eggs configuration
 ```
 
-_See code: [src/commands/info.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.35/src/commands/info.ts)_
+_See code: [src/commands/info.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.37/src/commands/info.ts)_
 
 ## `eggs install`
 
@@ -451,7 +451,7 @@ EXAMPLES
   kill the eggs/free the nest
 ```
 
-_See code: [src/commands/kill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.35/src/commands/kill.ts)_
+_See code: [src/commands/kill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.37/src/commands/kill.ts)_
 
 ## `eggs krill`
 
@@ -479,7 +479,7 @@ EXAMPLES
   Install the system using GUI or CLI installer
 ```
 
-_See code: [src/commands/krill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.35/src/commands/krill.ts)_
+_See code: [src/commands/krill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.37/src/commands/krill.ts)_
 
 ## `eggs mom`
 
@@ -496,7 +496,7 @@ DESCRIPTION
   ask for mommy - gui helper
 ```
 
-_See code: [src/commands/mom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.35/src/commands/mom.ts)_
+_See code: [src/commands/mom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.37/src/commands/mom.ts)_
 
 ## `eggs produce`
 
@@ -557,7 +557,7 @@ EXAMPLES
   in /home/eggs/ovarium and you can customize all you need
 ```
 
-_See code: [src/commands/produce.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.35/src/commands/produce.ts)_
+_See code: [src/commands/produce.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.37/src/commands/produce.ts)_
 
 ## `eggs remove`
 
@@ -587,7 +587,7 @@ EXAMPLES
   remove eggs, eggs configurations, packages dependencies
 ```
 
-_See code: [src/commands/remove.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.35/src/commands/remove.ts)_
+_See code: [src/commands/remove.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.37/src/commands/remove.ts)_
 
 ## `eggs syncfrom`
 
@@ -611,7 +611,7 @@ EXAMPLES
   $ sudo eggs restore
 ```
 
-_See code: [src/commands/syncfrom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.35/src/commands/syncfrom.ts)_
+_See code: [src/commands/syncfrom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.37/src/commands/syncfrom.ts)_
 
 ## `eggs syncto`
 
@@ -634,7 +634,7 @@ EXAMPLES
   $ sudo eggs syncto
 ```
 
-_See code: [src/commands/syncto.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.35/src/commands/syncto.ts)_
+_See code: [src/commands/syncto.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.37/src/commands/syncto.ts)_
 
 ## `eggs tools clean`
 
@@ -729,7 +729,7 @@ EXAMPLES
   update/upgrade the penguin's eggs tool
 ```
 
-_See code: [src/commands/update.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.35/src/commands/update.ts)_
+_See code: [src/commands/update.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.37/src/commands/update.ts)_
 
 ## `eggs version`
 

package/conf/tools.yaml

@@ -4,7 +4,7 @@
 penguins_eggs_conf: /etc/penguins-eggs.d/eggs.yaml
 
 # you can adapt this configuration to your needs
-remoteHost: 192.168.61.2
+remoteHost: 192.168.1.2
 
 # user to be used in remote host
 remoteUser: artisan

package/lib/classes/distro.js

@@ -307,18 +307,24 @@ class Distro {
             case 'n/a': {
                 this.familyId = 'archlinux';
                 this.distroLike = 'Arch';
+                this.codenameId = 'rolling';
                 this.codenameLikeId = 'rolling';
                 break;
             }
             /**
-             * GARUDA
+             * Manjaro
              */
-            case 'Harpy-Eagle': {
+            case 'Qonos':
+            case 'Ruah': {
                 this.familyId = 'archlinux';
                 this.distroLike = 'Arch';
                 this.codenameLikeId = 'rolling';
                 break;
             }
+            /**
+             * GARUDA
+             */
+            case 'Harpy-Eagle':
             case 'White-tailed-eagle': {
                 this.familyId = 'archlinux';
                 this.distroLike = 'Arch';
@@ -326,18 +332,8 @@ class Distro {
                 break;
             }
             /**
-             * Manjaro
+             * FEDORA
              */
-            case 'Qonos':
-            case 'Ruah': {
-                this.familyId = 'archlinux';
-                this.distroLike = 'Arch';
-                this.codenameLikeId = 'rolling';
-                break;
-                /**
-                 * Fedora
-                 */
-            }
             case 'ThirtyFive': {
                 this.familyId = 'fedora';
                 this.distroLike = 'Fedora';
@@ -372,9 +368,12 @@ class Distro {
         else {
             this.mountpointSquashFs = '/run/live/medium/live/filesystem.squashfs';
         }
-        if (this.familyId === "archlinux") {
+        if (this.distroId === "ManjaroLinux") {
             this.mountpointSquashFs = "/run/miso/bootmnt/live/filesystem.squashfs";
         }
+        else if (this.distroId === "Arch") {
+            this.mountpointSquashFs = "/run/archiso/bootmnt/live/filesystem.squashfs";
+        }
         /**
          * setting paths: syslinux, isolinux, usrLib
          */

package/lib/classes/ovary.js

@@ -191,11 +191,19 @@ class Ovary {
             }
             const xorrisoCommand = this.makeDotDisk(backup);
             /**
-             * patch to emulate miso archilinux
+             * patch to emulate miso/archiso on archilinux
              */
             if (this.familyId === 'archlinux') {
                 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);
+                if (this.settings.distro.distroId === 'ManjaroLinux') {
+                    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 (0, utils_1.exec)(`md5sum ${this.settings.work_dir.pathIso}/live/filesystem.squashfs > ${this.settings.work_dir.pathIso}/live/x86_64/livefs.md5`, this.echo);
+                }
+                else if (this.settings.distro.distroId === 'Arch') {
+                    await (0, utils_1.exec)(`ln ${this.settings.work_dir.pathIso}/live/filesystem.squashfs ${this.settings.work_dir.pathIso}/live/x86_64/airootfs.sfs`, this.echo);
+                    await (0, utils_1.exec)(`sha512sum ${this.settings.work_dir.pathIso}/live/filesystem.squashfs > ${this.settings.work_dir.pathIso}/live/x86_64/airootfs.sha512`, this.echo);
+                    // await exec(`gpg --detach-sign ${this.settings.work_dir.pathIso}/live/filesystem.squashfs ${this.settings.work_dir.pathIso}/live/x86_64/airootfs.sig`, this.echo)
+                }
             }
             await this.makeIso(xorrisoCommand, scriptOnly);
         }
@@ -214,7 +222,7 @@ class Ovary {
             this.tryCatch(cmd);
         }
         if (!fs_1.default.existsSync(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}`;
+            cmd = `cp ${node_path_1.default.resolve(__dirname, '../../conf/README.md')} ${this.settings.work_dir.path}README.md`;
             this.tryCatch(cmd);
         }
         if (!fs_1.default.existsSync(this.settings.work_dir.lowerdir)) {
@@ -508,10 +516,18 @@ class Ovary {
             utils_2.default.warning('Cannot find: ' + isolinuxTemplate);
             process.exit();
         }
+        /**
+         * kernel_parameters are used by miso, archiso
+         */
         let kernel_parameters = `boot=live components locales=${process.env.LANG}`;
-        let volid = utils_2.default.getVolid(this.settings.remix.name);
-        if (this.familyId === "archlinux") {
-            kernel_parameters = `misobasedir=live misolabel=${volid} boot=live locales=${process.env.LANG}`;
+        if (this.familyId === 'archlinux') {
+            let volid = utils_2.default.getVolid(this.settings.remix.name);
+            if (this.settings.distro.distroId === 'ManjaroLinux') {
+                kernel_parameters += ` misobasedir=live misolabel=${volid}`;
+            }
+            else if (this.settings.distro.distroId === 'Arch') {
+                kernel_parameters += ` archisobasedir=live archisolabel=${volid} cow_spacesize=4G`;
+            }
         }
         const template = fs_1.default.readFileSync(isolinuxTemplate, 'utf8');
         const view = {
@@ -922,7 +938,7 @@ class Ovary {
             // adduser live to wheel and autologin
             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`, this.verbose));
+            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} test $(grep "autologin" /etc/group) || chroot ${this.settings.work_dir.merged} 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') {
@@ -1255,10 +1271,18 @@ class Ovary {
             utils_2.default.warning('Cannot find: ' + grubTemplate);
             process.exit();
         }
-        let kernel_parameters = `boot=live locales=${process.env.LANG}`;
-        let volid = utils_2.default.getVolid(this.settings.remix.name);
-        if (this.familyId === "archlinux") {
-            kernel_parameters = `misobasedir=live misolabel=${volid} boot=live locales=${process.env.LANG}`;
+        /**
+        * kernel_parameters are used by miso, archiso
+        */
+        let kernel_parameters = `boot=live components locales=${process.env.LANG}`;
+        if (this.familyId === 'archlinux') {
+            let volid = utils_2.default.getVolid(this.settings.remix.name);
+            if (this.settings.distro.distroId === 'ManjaroLinux') {
+                kernel_parameters += ` misobasedir=live misolabel=${volid}`;
+            }
+            else if (this.settings.distro.distroId === 'Arch') {
+                kernel_parameters += ` archisobasedir=live archisolabel=${volid} cow_spacesize=4G`;
+            }
         }
         const grubDest = `${isoDir}/boot/grub/grub.cfg`;
         const template = fs_1.default.readFileSync(grubTemplate, 'utf8');

package/lib/classes/utils.js

@@ -495,7 +495,8 @@ class Utils {
             '/lib/live/mount',
             '/lib/live/mount/rootfs/filesystem.squashfs',
             '/live/aufs',
-            '/run/miso/sfs/livefs' // manjaro qonos
+            '/run/miso/sfs/livefs',
+            '/run/archiso/airootfs' // Arch
         ];
         for (let i = 0; i < paths.length; i++) {
             if (Utils.isMountpoint(paths[i])) {

package/lib/krill/krill-prepare.js

@@ -337,7 +337,7 @@ class Krill {
      */
     async install(location, keyboard, partitions, users, network, verbose = false) {
         const sequence = new krill_sequence_1.default(location, keyboard, partitions, users, network);
-        sequence.install(verbose);
+        await sequence.install(verbose);
     }
     /**
      * return true if pv exist

package/lib/krill/krill-sequence.d.ts

@@ -53,7 +53,7 @@ import machineId from './modules/machine-id';
 import fstab from './modules/fstab';
 import locale from './modules/locale';
 import setKeyboard from './modules/set-keyboard';
-import localeCfg from './modules/lòcale-cfg';
+import localeCfg from './modules/locale-cfg';
 import addUser from './modules/add-user';
 import changePassword from './modules/change-password';
 import networkCfg from './modules/network-cfg';