penguins-eggs 9.2.5 → 9.2.9

package/dist/interfaces/index.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/{lib → dist}/krill/krill-prepare.js

@@ -25,6 +25,7 @@ const tslib_1 = require("tslib");
  *   - summary
 */
 const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+const os_1 = tslib_1.__importDefault(require("os"));
 const react_1 = tslib_1.__importDefault(require("react"));
 const ink_1 = require("ink");
 const utils_1 = tslib_1.__importDefault(require("../classes/utils"));
@@ -79,7 +80,7 @@ class Krill {
     /**
      * @param cryped
      */
-    async prepare(unattended = false, cryped = false, pve = false, verbose = false) {
+    async prepare(unattended = false, ip = false, random = false, domain = 'local', suspend = false, small = false, none = false, cryped = false, pve = false, verbose = false) {
         /**
          * Check for disk presence
          */
@@ -138,10 +139,28 @@ class Krill {
                 filesystemType: this.krillConfig.filesystemType,
                 userSwapChoice: this.krillConfig.userSwapChoice
             };
+            if (suspend) {
+                oPartitions.userSwapChoice = 'suspend';
+            }
+            else if (small) {
+                oPartitions.userSwapChoice = 'small';
+            }
+            else if (none) {
+                oPartitions.userSwapChoice = 'none';
+            }
             let hostname = this.krillConfig.hostname;
             if (hostname === '') {
                 hostname = shelljs_1.default.exec('cat /etc/hostname').trim();
             }
+            if (ip) {
+                hostname = 'ip-' + utils_1.default.address().replaceAll('.', '-');
+            }
+            if (random) {
+                const fl = shelljs_1.default.exec(`tr -dc a-z </dev/urandom | head -c 2 ; echo ''`, { silent: true }).trim();
+                const n = shelljs_1.default.exec(`tr -dc 0-9 </dev/urandom | head -c 3 ; echo ''`, { silent: true }).trim();
+                const sl = shelljs_1.default.exec(`tr -dc a-z </dev/urandom | head -c 2 ; echo ''`, { silent: true }).trim();
+                hostname = `${os_1.default.hostname()}-${fl}${n}${sl}`;
+            }
             oUsers = {
                 name: this.krillConfig.name,
                 fullname: this.krillConfig.fullname,
@@ -176,7 +195,7 @@ class Krill {
         /**
         * installation
         */
-        await this.install(oLocation, oKeyboard, oPartitions, oUsers, oNetwork, unattended, verbose);
+        await this.install(oLocation, oKeyboard, oPartitions, oUsers, oNetwork, unattended, domain, verbose);
     }
     /**
      * WELCOME
@@ -434,13 +453,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?")) {
@@ -451,9 +470,9 @@ class Krill {
     /**
      * INSTALL
      */
-    async install(location, keyboard, partitions, users, network, unattended = false, verbose = false) {
+    async install(location, keyboard, partitions, users, network, unattended = false, domain = 'local', verbose = false) {
         const sequence = new krill_sequence_1.default(location, keyboard, partitions, users, network);
-        await sequence.install(unattended, verbose);
+        await sequence.start(unattended, domain, verbose);
     }
     /**
      * return true if pv exist

package/{lib → dist}/krill/krill-sequence.js

@@ -31,7 +31,7 @@ const unpackfs_1 = tslib_1.__importDefault(require("./modules/unpackfs"));
 const machine_id_1 = tslib_1.__importDefault(require("./modules/machine-id"));
 const fstab_1 = tslib_1.__importDefault(require("./modules/fstab"));
 const locale_1 = tslib_1.__importDefault(require("./modules/locale"));
-const set_keyboard_1 = tslib_1.__importDefault(require("./modules/set-keyboard"));
+const m_keyboard_1 = tslib_1.__importDefault(require("./modules/m-keyboard"));
 const locale_cfg_1 = tslib_1.__importDefault(require("./modules/locale-cfg"));
 // users
 const add_user_1 = tslib_1.__importDefault(require("./modules/add-user"));
@@ -42,7 +42,6 @@ const network_cfg_1 = tslib_1.__importDefault(require("./modules/network-cfg"));
 // services-systemd:
 // bootloader-config
 const bootloader_config_1 = tslib_1.__importDefault(require("./modules/bootloader-config"));
-const bootloader_config_arch_1 = tslib_1.__importDefault(require("./modules/bootloader-config-arch"));
 const bootloader_config_ubuntu_1 = tslib_1.__importDefault(require("./modules/bootloader-config-ubuntu"));
 //
 const grubcfg_1 = tslib_1.__importDefault(require("./modules/grubcfg"));
@@ -56,11 +55,10 @@ const initramfs_1 = tslib_1.__importDefault(require("./modules/initramfs"));
 const del_live_user_1 = tslib_1.__importDefault(require("./modules/del-live-user"));
 // umount already imported
 // to order in same wat
-const set_timezone_1 = tslib_1.__importDefault(require("./modules/set-timezone"));
+const m_timezone_1 = tslib_1.__importDefault(require("./modules/m-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!!!
  */
@@ -78,7 +76,7 @@ class Sequence {
         this.machineId = machine_id_1.default;
         this.fstab = fstab_1.default;
         this.locale = locale_1.default;
-        this.setKeyboard = set_keyboard_1.default;
+        this.keyboard = m_keyboard_1.default;
         this.localeCfg = locale_cfg_1.default;
         // users
         this.addUser = add_user_1.default;
@@ -89,7 +87,6 @@ class Sequence {
         // services-systemd:
         // bootloader-config
         this.bootloaderConfig = bootloader_config_1.default;
-        this.bootloaderConfigArch = bootloader_config_arch_1.default;
         this.bootloaderConfigUbuntu = bootloader_config_ubuntu_1.default;
         // 
         this.grubcfg = grubcfg_1.default;
@@ -103,12 +100,11 @@ class Sequence {
         this.delLiveUser = del_live_user_1.default;
         this.umountFs = mount_fs_1.umountFs;
         this.umountVfs = mount_vfs_1.umountVfs;
-        // to order in same wat
-        this.setTimezone = set_timezone_1.default;
+        // to order in same way
+        this.timezone = m_timezone_1.default;
         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 +129,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;
@@ -165,7 +162,8 @@ class Sequence {
      * @param umount
      * @returns
      */
-    async install(unattended = false, verbose = false) {
+    async start(unattended = false, domain = 'local', verbose = false) {
+        this.unattended = unattended;
         this.verbose = verbose;
         this.echo = utils_1.default.setEcho(this.verbose);
         if (this.verbose) {
@@ -289,7 +287,7 @@ class Sequence {
             message = "settings keyboard ";
             percent = 0.48;
             try {
-                this.setKeyboard();
+                this.keyboard();
             }
             catch (error) {
                 await utils_1.default.pressKeyToExit(JSON.stringify(error));
@@ -317,64 +315,14 @@ class Sequence {
             percent = 0.53;
             try {
                 await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
-                await this.hostname();
-            }
-            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;
-            try {
-                await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
-                await this.bootloaderConfig();
-            }
-            catch (error) {
-                await utils_1.default.pressKeyToExit(JSON.stringify(error));
-            }
-            // grubcfg
-            message = "grubcfg ";
-            percent = 0.63;
-            try {
-                await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
-                await this.grubcfg();
-            }
-            catch (error) {
-                await utils_1.default.pressKeyToExit(JSON.stringify(error));
-            }
-            // bootloader
-            message = "bootloader ";
-            percent = 0.64;
-            try {
-                await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
-                await this.bootloader();
-            }
-            catch (error) {
-                await utils_1.default.pressKeyToExit(JSON.stringify(error));
-            }
-            // packages
-            message = "add/remove packages";
-            percent = 0.65;
-            try {
-                await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
-                await this.packages();
+                await this.hostname(domain);
             }
             catch (error) {
                 await utils_1.default.pressKeyToExit(JSON.stringify(error));
             }
             // initramfsCfg
             message = "initramfs configure";
-            percent = 0.66;
+            percent = 0.55;
             try {
                 await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 this.initramfsCfg(this.partitions.installationDevice);
@@ -384,7 +332,7 @@ class Sequence {
             }
             // initramfs
             message = "initramfs ";
-            percent = 0.67;
+            percent = 0.60;
             try {
                 await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 await this.initramfs();
@@ -398,7 +346,7 @@ class Sequence {
             if (!fs_1.default.existsSync(this.luksFile) || fs_1.default.existsSync(this.personalFile)) {
                 // delLiveUser
                 message = "Removing user live ";
-                percent = 0.70;
+                percent = 0.61;
                 try {
                     await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                     await this.delLiveUser();
@@ -408,7 +356,7 @@ class Sequence {
                 }
                 // addUser
                 message = "Adding user ";
-                percent = 0.73;
+                percent = 0.62;
                 try {
                     await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                     await this.addUser(this.users.name, this.users.password, this.users.fullname, '', '', '');
@@ -418,7 +366,7 @@ class Sequence {
                 }
                 // changePassword
                 message = "adding user password ";
-                percent = 0.77;
+                percent = 0.63;
                 try {
                     await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                     await this.changePassword('root', this.users.rootPassword);
@@ -431,7 +379,7 @@ class Sequence {
             if (pacman_1.default.isInstalledGui()) {
                 try {
                     message = "autologin GUI";
-                    percent = 0.80;
+                    percent = 0.65;
                     if (this.users.autologin) {
                         await xdg_1.default.autologin(utils_1.default.getPrimaryUser(), this.users.name, this.installTarget);
                     }
@@ -443,7 +391,7 @@ class Sequence {
             }
             else { // autologin CLI remove DEFAULT
                 message = "autologin CLI";
-                percent = 0.80;
+                percent = 0.66;
                 try {
                     await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                     await cliAutologin.remove(this.installTarget);
@@ -455,12 +403,32 @@ class Sequence {
             // cleanup
             await cliAutologin.msgRemove(`${this.installTarget}/etc/motd`);
             await cliAutologin.msgRemove(`${this.installTarget}/etc/issue`);
-            // removeInstallerLink
-            message = "remove installer link";
-            percent = 0.87;
+            // bootloader-config [moved to the end]
+            message = "bootloader-config ";
+            percent = 0.70;
+            try {
+                await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                await this.bootloaderConfig();
+            }
+            catch (error) {
+                await utils_1.default.pressKeyToExit(JSON.stringify(error));
+            }
+            // grubcfg [moved to the end]
+            message = "grubcfg ";
+            percent = 0.75;
+            try {
+                await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                await this.grubcfg();
+            }
+            catch (error) {
+                await utils_1.default.pressKeyToExit(JSON.stringify(error));
+            }
+            // bootloader (grub-install) [moved to the end)
+            message = "bootloader ";
+            percent = 0.80;
             try {
                 await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
-                await this.removeInstallerLink();
+                await this.bootloader();
             }
             catch (error) {
                 await utils_1.default.pressKeyToExit(JSON.stringify(error));
@@ -468,7 +436,7 @@ class Sequence {
             // sourcesYolkUmount
             if (this.distro.familyId === 'debian') {
                 message = "sources yolk unmount";
-                percent = 0.92;
+                percent = 0.90;
                 try {
                     await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                     await this.execCalamaresModule('sources-yolk-unmount');
@@ -477,6 +445,30 @@ class Sequence {
                     await utils_1.default.pressKeyToExit(JSON.stringify(error));
                 }
             }
+            // packages
+            message = "add/remove packages";
+            percent = 0.91;
+            try {
+                await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                await this.packages();
+            }
+            catch (error) {
+                await utils_1.default.pressKeyToExit(JSON.stringify(error));
+            }
+            /**
+             * removeInstallerLink
+             */
+            if (await pacman_1.default.calamaresCheck()) {
+                message = "remove installer link";
+                percent = 0.93;
+                try {
+                    await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                    await this.removeInstallerLink();
+                }
+                catch (error) {
+                    await utils_1.default.pressKeyToExit(JSON.stringify(error));
+                }
+            }
             // umountVfs
             message = "umount VFS";
             percent = 0.95;
@@ -502,7 +494,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 +518,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 → dist}/krill/modules/bootloader-config.js

@@ -17,7 +17,7 @@ async function bootloaderConfig() {
         }
     }
     else if (this.distro.familyId === 'archlinux') {
-        this.bootloaderConfigArch();
+        // nothing
     }
 }
 exports.default = bootloaderConfig;

package/{lib → dist}/krill/modules/bootloader.js

@@ -34,10 +34,5 @@ async function bootloader() {
     catch (error) {
         await utils_2.default.pressKeyToExit(cmd);
     }
-    await (0, utils_1.exec)(`sleep 1 ${this.toNull}`, this.echo);
-    // let echoYes = Utils.setEcho(true)
-    // await exec(`chroot ${this.installTarget} grub-install ${this.partitions.installationDevice} ${this.toNull}`, echoYes)
-    // await exec(`chroot ${this.installTarget} grub-mkconfig -o /boot/grub/grub.cfg ${this.toNull}`, echoYes)
-    // await exec(`sleep 1 ${this.toNull}`, echoYes)
 }
 exports.default = bootloader;

package/dist/krill/modules/hostname.js

@@ -0,0 +1,48 @@
+"use strict";
+/**
+ * krill: module hostname
+ *
+ * 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"));
+/**
+ * hostname
+ */
+async function hostname(domain = 'local') {
+    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}.${domain} ${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 → dist}/krill/modules/locale.js

@@ -43,7 +43,7 @@ async function locale() {
     utils_1.default.write(file, content);
     // timezone
     try {
-        await this.setTimezone();
+        await this.timezone();
     }
     catch (error) {
         await utils_1.default.pressKeyToExit(JSON.stringify(error));

package/{lib/krill/modules/set-keyboard.js → dist/krill/modules/m-keyboard.js}

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * krill: module setKeyboard
+ * krill: module keyboard
  *
  * author: Piero Proietti
  * mail: piero.proietti@gmail.com
@@ -11,7 +11,12 @@ 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");
-async function setKeyboard() {
+const fs_1 = tslib_1.__importDefault(require("fs"));
+/**
+ *
+ * @param this
+ */
+async function mKeyboard() {
     /**
     * influence: - /etc/default/keyboard (x11)
     *            - /etc/vconsole.conf (console)
@@ -63,7 +68,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;
+exports.default = mKeyboard;

package/{lib/krill/modules/set-timezone.js → dist/krill/modules/m-timezone.js}

@@ -15,7 +15,7 @@ const fs_1 = tslib_1.__importDefault(require("fs"));
  *
  * @param this
  */
-async function setTimezone() {
+async function mTimezone() {
     if (fs_1.default.existsSync('/etc/localtime')) {
         const cmd = `chroot ${this.installTarget} unlink /etc/localtime`;
         await (0, utils_1.exec)(cmd, this.echo);
@@ -23,4 +23,4 @@ async function setTimezone() {
     const cmd = `chroot ${this.installTarget} ln -sf /usr/share/zoneinfo/${this.region}/${this.zone} /etc/localtime`;
     await (0, utils_1.exec)(cmd, this.echo);
 }
-exports.default = setTimezone;
+exports.default = mTimezone;