penguins-eggs 9.2.5 → 9.2.6

package/README.md

@@ -197,7 +197,7 @@ DESCRIPTION
   adapt monitor resolution for VM only
 ```
 
-_See code: [src/commands/adapt.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.2.5/src/commands/adapt.ts)_
+_See code: [src/commands/adapt.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.2.6/src/commands/adapt.ts)_
 
 ## `eggs analyze`
 
@@ -218,7 +218,7 @@ EXAMPLES
   $ sudo eggs analyze
 ```
 
-_See code: [src/commands/analyze.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.2.5/src/commands/analyze.ts)_
+_See code: [src/commands/analyze.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.2.6/src/commands/analyze.ts)_
 
 ## `eggs autocomplete [SHELL]`
 
@@ -276,7 +276,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.2.5/src/commands/calamares.ts)_
+_See code: [src/commands/calamares.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.2.6/src/commands/calamares.ts)_
 
 ## `eggs config`
 
@@ -300,7 +300,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.2.5/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.2.6/src/commands/config.ts)_
 
 ## `eggs cuckoo`
 
@@ -323,7 +323,7 @@ EXAMPLES
   start a PXE boot server
 ```
 
-_See code: [src/commands/cuckoo.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.2.5/src/commands/cuckoo.ts)_
+_See code: [src/commands/cuckoo.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.2.6/src/commands/cuckoo.ts)_
 
 ## `eggs dad`
 
@@ -343,7 +343,7 @@ DESCRIPTION
   ask help from daddy - configuration helper
 ```
 
-_See code: [src/commands/dad.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.2.5/src/commands/dad.ts)_
+_See code: [src/commands/dad.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.2.6/src/commands/dad.ts)_
 
 ## `eggs export deb`
 
@@ -424,10 +424,11 @@ command-line system installer - the egg became a penguin!
 
 ```
 USAGE
-  $ eggs install [-u] [-k] [-p] [-h] [-v]
+  $ eggs install [-u] [-i] [-k] [-p] [-h] [-v]
 
 FLAGS
   -h, --help        Show CLI help.
+  -i, --ip          add ip to hostname
   -k, --crypted     crypted CLI installation
   -p, --pve         Proxmox VE install
   -u, --unattended  unattended CLI installation
@@ -441,7 +442,7 @@ EXAMPLES
   Install the system using krill installer
 ```
 
-_See code: [src/commands/install.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.2.5/src/commands/install.ts)_
+_See code: [src/commands/install.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.2.6/src/commands/install.ts)_
 
 ## `eggs kill`
 
@@ -463,7 +464,7 @@ EXAMPLES
   kill the eggs/free the nest
 ```
 
-_See code: [src/commands/kill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.2.5/src/commands/kill.ts)_
+_See code: [src/commands/kill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.2.6/src/commands/kill.ts)_
 
 ## `eggs mom`
 
@@ -480,7 +481,7 @@ DESCRIPTION
   ask for mommy - gui helper
 ```
 
-_See code: [src/commands/mom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.2.5/src/commands/mom.ts)_
+_See code: [src/commands/mom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.2.6/src/commands/mom.ts)_
 
 ## `eggs produce`
 
@@ -542,7 +543,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.2.5/src/commands/produce.ts)_
+_See code: [src/commands/produce.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.2.6/src/commands/produce.ts)_
 
 ## `eggs status`
 
@@ -560,7 +561,7 @@ DESCRIPTION
   informations about eggs status
 ```
 
-_See code: [src/commands/status.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.2.5/src/commands/status.ts)_
+_See code: [src/commands/status.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.2.6/src/commands/status.ts)_
 
 ## `eggs syncfrom`
 
@@ -584,7 +585,7 @@ EXAMPLES
   $ sudo eggs restore
 ```
 
-_See code: [src/commands/syncfrom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.2.5/src/commands/syncfrom.ts)_
+_See code: [src/commands/syncfrom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.2.6/src/commands/syncfrom.ts)_
 
 ## `eggs syncto`
 
@@ -607,7 +608,7 @@ EXAMPLES
   $ sudo eggs syncto
 ```
 
-_See code: [src/commands/syncto.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.2.5/src/commands/syncto.ts)_
+_See code: [src/commands/syncto.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.2.6/src/commands/syncto.ts)_
 
 ## `eggs tools clean`
 
@@ -702,7 +703,7 @@ EXAMPLES
   update/upgrade the penguin's eggs tool
 ```
 
-_See code: [src/commands/update.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.2.5/src/commands/update.ts)_
+_See code: [src/commands/update.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.2.6/src/commands/update.ts)_
 
 ## `eggs version`
 

package/conf/distros/jessie/krill/settings.yml

@@ -1,8 +1,46 @@
-# Debian buster, Debian bullseye, Devuan beowulf
-# settings
+# Debian jessie, stretch
 ---
 # "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules
-modules-search: [local, /usr/lib/calamares/modules]
+modules-search: [ local, /usr/lib/calamares/modules ]
+
+# If this is set to true, Calamares refers to itself as a "setup program"
+# rather than an "installer". Defaults to the value of dont-chroot, but
+# Calamares will complain if this is not explicitly set.
+oem-setup: false
+
+# If this is set to true, the "Cancel" button will be disabled entirely.
+# The button is also hidden from view.
+#
+# This can be useful if when e.g. Calamares is used as a post-install
+# configuration tool and you require the user to go through all the
+# configuration steps.
+#
+# Default is false, but Calamares will complain if this is not explicitly set.
+#
+# YAML: boolean.
+disable-cancel: false
+
+# If this is set to true, the "Cancel" button will be disabled once
+# you start the 'Installation', meaning there won't be a way to cancel
+# the Installation until it has finished or installation has failed.
+#
+# Default is false, but Calamares will complain if this is not explicitly set.
+#
+# YAML: boolean.
+disable-cancel-during-exec: false
+
+# If this is set to true, then once the end of the sequence has
+# been reached, the quit (done) button is clicked automatically
+# and Calamares will close. Default is false: the user will see
+# that the end of installation has been reached, and that things are ok.
+#
+#
+quit-at-end: false
+
+instances:
+- id:       cleanup
+  module:   shellprocess
+  config:   shellprocess_cleanup.conf
 
 sequence:
   # Phase 1 - prepare.
@@ -14,7 +52,7 @@ sequence:
       - locale
       - keyboard
       - partition
-      - users
+      {{createUsers}}users
       - summary
 
   # Phase 2 - install.
@@ -27,17 +65,18 @@ sequence:
       - partition
       - mount
       - unpackfs
+      # dpkg-unsafe-io
       - sources-yolk
-      {{s}}machineid
+      {{hasSystemd}}machineid
       - fstab
       - locale
       - keyboard
       - localecfg
-      - users
-      - displaymanager
+      {{createUsers}}users
+      {{hasDisplaymanager}}displaymanager 
       - networkcfg
       - hwclock
-      {{s}}services-systemd
+      {{hasSystemd}}services-systemd 
       - bootloader-config
       - grubcfg
       - bootloader
@@ -46,6 +85,7 @@ sequence:
       - plymouthcfg
       - initramfscfg
       - initramfs
+      # dpkg-unsafe-io-undo
       - removeuser
       - sources-yolk-unmount
       - cleanup
@@ -88,4 +128,3 @@ prompt-install: false
 #
 # YAML: boolean.
 dont-chroot: false
-

package/lib/classes/distro.js

@@ -120,6 +120,7 @@ class Distro {
                 this.distroLike = 'Debian';
                 this.codenameLikeId = 'jessie';
                 this.liveMediumPath = '/lib/live/mount/medium/';
+                this.isCalamaresAvailable = false;
                 break;
             }
             case 'stretch': {
@@ -127,6 +128,7 @@ class Distro {
                 this.distroLike = 'Debian';
                 this.codenameLikeId = 'stretch';
                 this.liveMediumPath = '/lib/live/mount/medium/';
+                this.isCalamaresAvailable = false;
                 break;
             }
             case 'buster': {

package/lib/classes/incubation/distros/jessie.js

@@ -30,7 +30,7 @@ class Jessie {
         this.distro = distro;
         this.user_opt = user_opt;
         this.verbose = verbose;
-        this.release = release;
+        this.release = release; // nel senso di --final 
     }
     /**
      *

package/lib/classes/incubation/fisherman.js

@@ -18,8 +18,8 @@ class Fisherman {
     constructor(distro, installer, verbose = false) {
         this.installer = {};
         this.verbose = false;
-        this.installer = installer;
         this.distro = distro;
+        this.installer = installer;
         this.verbose = verbose;
     }
     /**

package/lib/classes/pxe.js

@@ -98,9 +98,10 @@ class Pxe {
         await this.tryCatch(`mkdir ${this.pxeRoot} -p`);
         await this.tryCatch(`ln -s ${this.isoRoot}live ${this.pxeRoot}/live`);
         await this.tryCatch(`ln -s ${this.isoRoot}.disk ${this.pxeRoot}/.disk`);
-        await this.tryCatch(`ln -s ${this.isoRoot}live/${this.vmlinuz} ${this.pxeRoot}/vmlinuz`);
+        // Qua copio vmlinuz e initrd per renderli scrivibili
+        await this.tryCatch(`cp ${this.isoRoot}live/${this.vmlinuz} ${this.pxeRoot}/vmlinuz`);
         await this.tryCatch(`chmod 777 ${this.pxeRoot}/vmlinuz`);
-        await this.tryCatch(`ln -s ${this.isoRoot}live/${this.initrd} ${this.pxeRoot}/initrd`);
+        await this.tryCatch(`cp ${this.isoRoot}live/${this.initrd} ${this.pxeRoot}/initrd`);
         await this.tryCatch(`chmod 777 ${this.pxeRoot}/initrd`);
         // link iso images in pxe
         for (const iso of this.isos) {
@@ -142,8 +143,15 @@ class Pxe {
         content += `LABEL http\n`;
         content += `MENU LABEL ${this.bootLabel}\n`;
         content += `MENU DEFAULT\n`;
-        content += `KERNEL http://${utils_1.default.address()}/live/${this.vmlinuz}\n`;
-        content += `APPEND initrd=http://${utils_1.default.address()}/live/${this.initrd} boot=live config noswap noprompt fetch=http://${utils_1.default.address()}/live/filesystem.squashfs\n`;
+        let clid = this.settings.distro.codenameLikeId;
+        if (clid === 'bionic' || clid === 'stretch' || clid === 'jessie') {
+            content += `KERNEL vmlinuz\n`;
+            content += `APPEND initrd=initrd boot=live config noswap noprompt fetch=http://${utils_1.default.address()}/live/filesystem.squashfs\n`;
+        }
+        else {
+            content += `KERNEL http://${utils_1.default.address()}/vmlinuz\n`;
+            content += `APPEND initrd=http://${utils_1.default.address()}/initrd boot=live config noswap noprompt fetch=http://${utils_1.default.address()}/live/filesystem.squashfs\n`;
+        }
         content += `SYSAPPEND 3\n`;
         content += `\n`;
         if (this.isos.length > 0) {
@@ -278,7 +286,12 @@ class Pxe {
      * @param real
      */
     async dnsmasq(real = false) {
-        await (0, utils_2.exec)(`systemctl stop dnsmasq.service`);
+        if (utils_1.default.isSystemd()) {
+            await (0, utils_2.exec)(`systemctl stop dnsmasq.service`);
+        }
+        else {
+            await (0, utils_2.exec)(`service dnsmasq stop`);
+        }
         let domain = `penguins-eggs.lan`;
         let n = new netmask_1.Netmask(`${utils_1.default.address()}/${utils_1.default.netmask()}`);
         let content = ``;
@@ -311,7 +324,13 @@ class Pxe {
          * interfering with proxy PXE subsystems when it is just
          * the DHCP server. Thanks to Spencer Clark for spotting this.
          */
-        content += `pxe-service=X86PC,"penguin's eggs cuckoo",pxelinux.0\n`;
+        const addZero = this.settings.distro.codenameId !== 'jessie';
+        if (addZero) {
+            content += `pxe-service=X86PC,"penguin's eggs cuckoo",lpxelinux.0\n`;
+        }
+        else {
+            content += `pxe-service=X86PC,"penguin's eggs cuckoo",lpxelinux\n`;
+        }
         if (real) {
             content += `dhcp-range=${await utils_1.default.iface()},${n.first},${n.last},${n.mask},8h\n`;
         }
@@ -321,7 +340,12 @@ class Pxe {
         let file = '/etc/dnsmasq.d/cuckoo.conf';
         fs_1.default.writeFileSync(file, content);
         // console.log(content)
-        await (0, utils_2.exec)(`systemctl start dnsmasq.service`);
+        if (utils_1.default.isSystemd()) {
+            await (0, utils_2.exec)(`systemctl start dnsmasq.service`);
+        }
+        else {
+            await (0, utils_2.exec)(`service dnsmasq start`);
+        }
     }
     /**
      * start http server for images

package/lib/commands/install.d.ts

@@ -11,6 +11,7 @@ import { Command } from '@oclif/core';
 export default class Install extends Command {
     static flags: {
         unattended: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        ip: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         crypted: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         pve: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;

package/lib/commands/install.js

@@ -21,6 +21,7 @@ class Install extends core_1.Command {
         utils_1.default.titles(this.id + ' ' + this.argv);
         const { flags } = await this.parse(Install);
         let unattended = flags.unattended;
+        let ip = flags.ip;
         let crypted = flags.crypted;
         let pve = flags.pve;
         if (pve) {
@@ -30,7 +31,7 @@ class Install extends core_1.Command {
         if (utils_1.default.isRoot()) {
             if (utils_1.default.isLive()) {
                 const krill = new krill_prepare_1.default();
-                await krill.prepare(unattended, crypted, pve, verbose);
+                await krill.prepare(unattended, ip, crypted, pve, verbose);
             }
             else {
                 utils_1.default.warning('You are in an installed system!');
@@ -44,6 +45,7 @@ class Install extends core_1.Command {
 exports.default = Install;
 Install.flags = {
     unattended: core_1.Flags.boolean({ char: 'u', description: 'unattended CLI installation' }),
+    ip: core_1.Flags.boolean({ char: 'i', description: 'add ip to hostname' }),
     crypted: core_1.Flags.boolean({ char: 'k', description: 'crypted CLI installation' }),
     pve: core_1.Flags.boolean({ char: 'p', description: 'Proxmox VE install' }),
     help: core_1.Flags.help({ char: 'h' }),

package/lib/interfaces/i-installer.d.ts

@@ -1,6 +1,6 @@
 /**
  * name  = 'calamares' oppure 'krill'
- * configuration = '/etc/calamares/' oppure '/etc/penguins-eggs.d/krill/'
+ * configuration = '/etc/calamares/' o '/etc/penguins-eggs.d/krill/'
  * modules = configuration + 'modules/'
  * modulesMultiarch = '/usr/lib/' + arch-linux-gnu + '/' + installer + '/'
  *

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

@@ -20,7 +20,7 @@ export default class Krill {
     /**
      * @param cryped
      */
-    prepare(unattended?: boolean, cryped?: boolean, pve?: boolean, verbose?: boolean): Promise<void>;
+    prepare(unattended?: boolean, ip?: boolean, cryped?: boolean, pve?: boolean, verbose?: boolean): Promise<void>;
     /**
      * WELCOME
      */

package/lib/krill/krill-prepare.js

@@ -79,7 +79,7 @@ class Krill {
     /**
      * @param cryped
      */
-    async prepare(unattended = false, cryped = false, pve = false, verbose = false) {
+    async prepare(unattended = false, ip = false, cryped = false, pve = false, verbose = false) {
         /**
          * Check for disk presence
          */
@@ -142,6 +142,9 @@ class Krill {
             if (hostname === '') {
                 hostname = shelljs_1.default.exec('cat /etc/hostname').trim();
             }
+            if (ip) {
+                hostname = 'ip-' + utils_1.default.address().replaceAll('.', '-');
+            }
             oUsers = {
                 name: this.krillConfig.name,
                 fullname: this.krillConfig.fullname,
@@ -434,13 +437,13 @@ class Krill {
         let summaryElem;
         let message = "";
         if (unattended) {
-            message = "Unattended installation will start in 30 seconds, press CTRL-C to abort!";
+            message = "Unattended installation will start in 5 seconds, press CTRL-C to abort!";
         }
         while (true) {
             summaryElem = react_1.default.createElement(summary_1.default, { name: users.name, password: users.password, rootPassword: users.rootPassword, hostname: users.hostname, region: location.region, zone: location.zone, language: location.language, keyboardModel: keyboard.keyboardModel, keyboardLayout: keyboard.keyboardLayout, installationDevice: partitions.installationDevice, message: message });
             if (unattended) {
                 redraw(summaryElem);
-                await sleep(30000);
+                await sleep(5000);
                 break;
             }
             else if (await confirm(summaryElem, "Confirm Summary datas?")) {

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

@@ -71,7 +71,6 @@ import setTimezone from './modules/set-timezone';
 import umount from './modules/umount';
 import mkfs from './modules/mkfs';
 import hostname from './modules/hostname';
-import hosts from './modules/hosts';
 /**
  * hatching: installazione o cova!!!
  */
@@ -104,7 +103,6 @@ export default class Sequence {
     umount: typeof umount;
     mkfs: typeof mkfs;
     hostname: typeof hostname;
-    hosts: typeof hosts;
     installer: IInstaller;
     installTarget: string;
     verbose: boolean;
@@ -129,6 +127,7 @@ export default class Sequence {
     luksDevice: string;
     luksMountpoint: string;
     personalFile: string;
+    unattended: boolean;
     /**
      * constructor
      */
@@ -147,5 +146,5 @@ export default class Sequence {
     /**
      * only show the result
      */
-    finished(unattended?: boolean): Promise<void>;
+    finished(): Promise<void>;
 }

package/lib/krill/krill-sequence.js

@@ -60,7 +60,6 @@ const set_timezone_1 = tslib_1.__importDefault(require("./modules/set-timezone")
 const umount_1 = tslib_1.__importDefault(require("./modules/umount"));
 const mkfs_1 = tslib_1.__importDefault(require("./modules/mkfs"));
 const hostname_1 = tslib_1.__importDefault(require("./modules/hostname"));
-const hosts_1 = tslib_1.__importDefault(require("./modules/hosts"));
 /**
  * hatching: installazione o cova!!!
  */
@@ -108,7 +107,6 @@ class Sequence {
         this.umount = umount_1.default;
         this.mkfs = mkfs_1.default;
         this.hostname = hostname_1.default;
-        this.hosts = hosts_1.default;
         this.installer = {};
         this.installTarget = '/tmp/calamares-krill-root';
         this.verbose = false;
@@ -133,6 +131,7 @@ class Sequence {
         this.luksDevice = '';
         this.luksMountpoint = '';
         this.personalFile = '';
+        this.unattended = false;
         this.installer = (0, installer_1.installer)();
         this.settings = new settings_1.default();
         this.language = location.language;
@@ -166,6 +165,7 @@ class Sequence {
      * @returns
      */
     async install(unattended = false, verbose = false) {
+        this.unattended = unattended;
         this.verbose = verbose;
         this.echo = utils_1.default.setEcho(this.verbose);
         if (this.verbose) {
@@ -322,16 +322,6 @@ class Sequence {
             catch (error) {
                 await utils_1.default.pressKeyToExit(JSON.stringify(error));
             }
-            // hosts
-            message = "Creating hosts ";
-            percent = 0.60;
-            try {
-                await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
-                await this.hosts();
-            }
-            catch (error) {
-                await utils_1.default.pressKeyToExit(JSON.stringify(error));
-            }
             // bootloader-config
             message = "bootloader-config ";
             percent = 0.62;
@@ -502,7 +492,7 @@ class Sequence {
             percent = 100.0;
             try {
                 await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
-                await this.finished(unattended);
+                await this.finished();
             }
             catch (error) {
                 await utils_1.default.pressKeyToExit(JSON.stringify(error));
@@ -526,9 +516,9 @@ class Sequence {
     /**
      * only show the result
      */
-    async finished(unattended = false) {
+    async finished() {
         await redraw(react_1.default.createElement(finished_1.default, { installationDevice: this.partitions.installationDevice, hostName: this.users.hostname, userName: this.users.name }));
-        if (!unattended) {
+        if (!this.unattended) {
             utils_1.default.pressKeyToExit('Press a key to reboot...');
         }
         shelljs_1.default.exec('reboot');

package/lib/krill/modules/hostname.js

@@ -8,11 +8,41 @@
  * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../lib/utils");
+const tslib_1 = require("tslib");
+const fs_1 = tslib_1.__importDefault(require("fs"));
 /**
  * hostname
  */
 async function hostname() {
-    await (0, utils_1.exec)(`echo ${this.installTarget + '/etc/hostname'} > ${this.users.hostname} `, this.echo);
+    let hostname = this.users.hostname;
+    /**
+     * hostname
+     */
+    {
+        let file = this.installTarget + '/etc/hostname';
+        let text = hostname;
+        fs_1.default.writeFileSync(file, text);
+    }
+    /**
+     * hosts
+     */
+    {
+        let file = this.installTarget + '/etc/hosts';
+        let text = '127.0.0.1 localhost localhost.localdomain\n';
+        if (this.network.addressType === 'static') {
+            text += `${this.network.address} ${hostname} pvelocalhost\n`;
+        }
+        else {
+            text += `127.0.1.1 ${hostname} \n`;
+        }
+        text += `# The following lines are desirable for IPv6 capable hosts\n`;
+        text += `:: 1     ip6 - localhost ip6 - loopback\n`;
+        text += `fe00:: 0 ip6 - localnet\n`;
+        text += `ff00:: 0 ip6 - mcastprefix\n`;
+        text += `ff02:: 1 ip6 - allnodes\n`;
+        text += `ff02:: 2 ip6 - allrouters\n`;
+        text += `ff02:: 3 ip6 - allhosts\n`;
+        fs_1.default.writeFileSync(file, text);
+    }
 }
 exports.default = hostname;

package/lib/krill/modules/partition.js

@@ -13,8 +13,7 @@ const tslib_1 = require("tslib");
 const utils_1 = require("../../lib/utils");
 const utils_2 = tslib_1.__importDefault(require("../../classes/utils"));
 const shelljs_1 = tslib_1.__importDefault(require("shelljs"));
-// import React from 'react';
-// import { render, RenderOptions } from 'ink'
+const os_1 = tslib_1.__importDefault(require("os"));
 /**
  *
  * @param this
@@ -33,6 +32,18 @@ async function partition() {
         p = 'p';
     }
     const installMode = this.partitions.installationMode;
+    let swapSize = Math.round(os_1.default.totalmem() / 1073741824) * 1024;
+    if (this.partitions.userSwapChoice === 'none') {
+        swapSize = 0;
+    }
+    else if (this.partitions.userSwapChoice === 'small') {
+    }
+    else if (this.partitions.userSwapChoice === 'suspend') {
+        swapSize *= 2;
+    }
+    else if (this.partitions.userSwapChoice === 'file') {
+        swapSize = 0;
+    }
     if (installMode === 'standard' && !this.efi) {
         /**
          * ===========================================================================================
@@ -40,8 +51,8 @@ async function partition() {
          * ===========================================================================================
          */
         await (0, utils_1.exec)(`parted --script ${installDevice} mklabel msdos`, this.echo);
-        await (0, utils_1.exec)(`parted --script --align optimal ${installDevice} mkpart primary linux-swap    1MiB     8192MiB`, this.echo); //dev/sda1 swap
-        await (0, utils_1.exec)(`parted --script --align optimal ${installDevice} mkpart primary ext4       8192MiB     100%`, this.echo); //dev/sda2 root
+        await (0, utils_1.exec)(`parted --script --align optimal ${installDevice} mkpart primary linux-swap       1MiB    ${swapSize + 1}MiB`, this.echo); //dev/sda1 swap
+        await (0, utils_1.exec)(`parted --script --align optimal ${installDevice} mkpart primary ext4 ${swapSize + 1}MiB                100%`, this.echo); //dev/sda2 root
         await (0, utils_1.exec)(`parted ${installDevice} set 1 boot on`, this.echo);
         await (0, utils_1.exec)(`parted ${installDevice} set 1 esp on`, this.echo);
         // SWAP
@@ -65,9 +76,9 @@ async function partition() {
          * ===========================================================================================
          */
         await (0, utils_1.exec)(`parted --script ${installDevice} mklabel msdos`, this.echo);
-        await (0, utils_1.exec)(`parted --script --align optimal ${installDevice} mkpart primary ext4          1MiB   512MiB`, this.echo); // sda1
-        await (0, utils_1.exec)(`parted --script --align optimal ${installDevice} mkpart primary linux-swap  512MiB  8704MiB`, this.echo); // sda2
-        await (0, utils_1.exec)(`parted --script --align optimal ${installDevice} mkpart primary ext4       8704MiB     100%`, this.echo); // sda3
+        await (0, utils_1.exec)(`parted --script --align optimal ${installDevice} mkpart primary ext4         1MiB        512MiB`, this.echo); // sda1
+        await (0, utils_1.exec)(`parted --script --align optimal ${installDevice} mkpart primary linux-swap 512MiB        ${swapSize + 512}MiB`, this.echo); // sda2
+        await (0, utils_1.exec)(`parted --script --align optimal ${installDevice} mkpart primary ext4 ${swapSize + 512}MiB                100%`, this.echo); // sda3
         await (0, utils_1.exec)(`parted --script ${installDevice} set 1 boot on`, this.echo); // sda1
         await (0, utils_1.exec)(`parted --script ${installDevice} set 1 esp on`, this.echo); // sda1
         // BOOT 512M
@@ -120,9 +131,9 @@ async function partition() {
          * ===========================================================================================
          */
         await (0, utils_1.exec)(`parted --script ${installDevice} mklabel gpt`, this.echo);
-        await (0, utils_1.exec)(`parted --script ${installDevice} mkpart efi  fat32         34s   256MiB`, this.echo); // sda1 EFI
-        await (0, utils_1.exec)(`parted --script ${installDevice} mkpart swap linux-swap 768MiB  8960MiB`, this.echo); // sda2 swap
-        await (0, utils_1.exec)(`parted --script ${installDevice} mkpart root ext4      8960MiB     100%`, this.echo); // sda3 root
+        await (0, utils_1.exec)(`parted --script ${installDevice} mkpart efi  fat32      34s                256MiB`, this.echo); // sda1 EFI
+        await (0, utils_1.exec)(`parted --script ${installDevice} mkpart swap linux-swap 256MiB ${swapSize + 256}Mib`, this.echo); // sda2 swap
+        await (0, utils_1.exec)(`parted --script ${installDevice} mkpart root ext4 ${swapSize + 256}MiB         100%`, this.echo); // sda3 root
         await (0, utils_1.exec)(`parted --script ${installDevice} set 1 boot on`, this.echo); // sda1
         await (0, utils_1.exec)(`parted --script ${installDevice} set 1 esp on`, this.echo); // sda1
         this.devices.efi.name = `${installDevice}${p}1`;
@@ -147,10 +158,10 @@ async function partition() {
          * ===========================================================================================
          */
         await (0, utils_1.exec)(`parted --script ${installDevice} mklabel gpt`, this.echo);
-        await (0, utils_1.exec)(`parted --script ${installDevice} mkpart efi fat32           34s   256MiB`, this.echo); // sda1 EFI
-        await (0, utils_1.exec)(`parted --script ${installDevice} mkpart boot ext4        256MiB   768MiB`, this.echo); // sda2 boot
-        await (0, utils_1.exec)(`parted --script ${installDevice} mkpart swap linux-swap  768MiB  8960MiB`, this.echo); // sda3 swap
-        await (0, utils_1.exec)(`parted --script ${installDevice} mkpart root ext4       8960MiB     100%`, this.echo); // sda4 root
+        await (0, utils_1.exec)(`parted --script ${installDevice} mkpart efi fat32               34s               256MiB`, this.echo); // sda1 EFI
+        await (0, utils_1.exec)(`parted --script ${installDevice} mkpart boot ext4             256MiB              768MiB`, this.echo); // sda2 boot
+        await (0, utils_1.exec)(`parted --script ${installDevice} mkpart swap linux-swap       768MiB  ${swapSize + 768}MiB`, this.echo); // sda3 swap
+        await (0, utils_1.exec)(`parted --script ${installDevice} mkpart root ext4 ${swapSize + 768}MiB                100%`, this.echo); // sda4 root
         await (0, utils_1.exec)(`parted --script ${installDevice} set 1 boot on`, this.echo); // sda1
         await (0, utils_1.exec)(`parted --script ${installDevice} set 1 esp on`, this.echo); // sda1
         // EFI 256M

package/lib/krill/modules/set-keyboard.js

@@ -11,6 +11,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const utils_1 = tslib_1.__importDefault(require("../../classes/utils"));
 const utils_2 = require("../../lib/utils");
+const fs_1 = tslib_1.__importDefault(require("fs"));
 async function setKeyboard() {
     /**
     * influence: - /etc/default/keyboard (x11)
@@ -63,7 +64,10 @@ async function setKeyboard() {
         content += `        MatchIsKeyboard "on"\n`;
         content += `        Option "XkbLayout" "` + this.keyboardLayout + `"\n`;
         content += `EndSection\n`;
-        utils_1.default.write(this.installTarget + '/etc/X11/xorg.conf.d/00-keyboard.conf', content);
+        // Not always exist /etc/X11/xorg.conf.d
+        if (fs_1.default.existsSync(`this.installTarget + '/etc/X11/xorg.conf.d`)) {
+            utils_1.default.write(this.installTarget + '/etc/X11/xorg.conf.d/00-keyboard.conf', content);
+        }
     }
 }
 exports.default = setKeyboard;

package/lib/lib/cli-autologin.js

@@ -110,7 +110,7 @@ exports.remove = remove;
  */
 async function addMotd(distro, version, user, userPasswd, rootPasswd, chroot = '/') {
     const fileMotd = `${chroot}/etc/motd`;
-    let installer = 'sudo eggs krill';
+    let installer = 'sudo eggs install';
     if (pacman_1.default.packageIsInstalled('calamares')) {
         if (pacman_1.default.packageIsInstalled('plasma-desktop')) {
             installer = 'startplasma-wayland to run GUI and launch calamares, or from terminal sudo eggs krill -c';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "penguins-eggs",
   "description": "Perri's Brewery edition: remaster your system and distribuite it",
-  "version": "9.2.5",
+  "version": "9.2.6",
   "author": "Piero Proietti @pieroproietti",
   "bin": {
     "eggs": "bin/run"

package/lib/krill/modules/hosts.d.ts

@@ -1,14 +0,0 @@
-/**
- * krill: module hosts
- *
- * author: Piero Proietti
- * mail: piero.proietti@gmail.com
- *
- * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
- */
-import Sequence from '../krill-sequence';
-/**
- * hosts
- * @param this
- */
-export default function hosts(this: Sequence): Promise<void>;

package/lib/krill/modules/hosts.js

@@ -1,35 +0,0 @@
-"use strict";
-/**
- * krill: module hosts
- *
- * author: Piero Proietti
- * mail: piero.proietti@gmail.com
- *
- * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const fs_1 = tslib_1.__importDefault(require("fs"));
-/**
- * hosts
- * @param this
- */
-async function hosts() {
-    const file = this.installTarget + '/etc/hosts';
-    let text = '127.0.0.1 localhost localhost.localdomain\n';
-    if (this.network.addressType === 'static') {
-        text += `${this.network.address} ${this.users.hostname} pvelocalhost\n`;
-    }
-    else {
-        text += `127.0.1.1 ${this.users.hostname} \n`;
-    }
-    text += `# The following lines are desirable for IPv6 capable hosts\n`;
-    text += `:: 1     ip6 - localhost ip6 - loopback\n`;
-    text += `fe00:: 0 ip6 - localnet\n`;
-    text += `ff00:: 0 ip6 - mcastprefix\n`;
-    text += `ff02:: 1 ip6 - allnodes\n`;
-    text += `ff02:: 2 ip6 - allrouters\n`;
-    text += `ff02:: 3 ip6 - allhosts\n`;
-    fs_1.default.writeFileSync(file, text);
-}
-exports.default = hosts;