penguins-eggs 9.1.35 → 9.1.37

package/lib/krill/krill-sequence.js

@@ -32,7 +32,7 @@ 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 l_cale_cfg_1 = tslib_1.__importDefault(require("./modules/l\u00F2cale-cfg"));
+const locale_cfg_1 = tslib_1.__importDefault(require("./modules/locale-cfg"));
 // users
 const add_user_1 = tslib_1.__importDefault(require("./modules/add-user"));
 const change_password_1 = tslib_1.__importDefault(require("./modules/change-password"));
@@ -79,7 +79,7 @@ class Sequence {
         this.fstab = fstab_1.default;
         this.locale = locale_1.default;
         this.setKeyboard = set_keyboard_1.default;
-        this.localeCfg = l_cale_cfg_1.default;
+        this.localeCfg = locale_cfg_1.default;
         // users
         this.addUser = add_user_1.default;
         this.changePassword = change_password_1.default;
@@ -177,7 +177,7 @@ class Sequence {
         message = "Creating partitions";
         percent = 0.01;
         try {
-            redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+            await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
             isPartitioned = await this.partition();
         }
         catch (error) {
@@ -188,7 +188,7 @@ class Sequence {
             message = "Formatting file system ";
             percent = 0.02;
             try {
-                redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 await this.mkfs();
             }
             catch (error) {
@@ -208,7 +208,7 @@ class Sequence {
             message = "Mounting on target VFS ";
             percent = 0.06;
             try {
-                redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 await this.mountVfs();
             }
             catch (error) {
@@ -218,8 +218,7 @@ class Sequence {
             message = "Unpacking filesystem ";
             percent = 0.10;
             try {
-                //  spinner={true}
-                redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 await this.unpackfs();
             }
             catch (error) {
@@ -234,7 +233,7 @@ class Sequence {
                 percent = 0.37;
                 let cmd = 'eggs syncfrom --rootdir /tmp/calamares-krill-root/';
                 try {
-                    redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent, spinner: true }));
+                    await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent, spinner: true }));
                     await (0, utils_2.exec)(cmd, utils_1.default.setEcho(true));
                 }
                 catch (error) {
@@ -246,7 +245,7 @@ class Sequence {
                 message = 'sources-yolk';
                 percent = 0.40;
                 try {
-                    redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent, spinner: true }));
+                    await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent, spinner: true }));
                     await this.execCalamaresModule('sources-yolk');
                 }
                 catch (error) {
@@ -257,7 +256,7 @@ class Sequence {
             message = 'machineid';
             percent = 0.41;
             try {
-                redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent, spinner: true }));
+                await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent, spinner: true }));
                 await this.machineId();
             }
             catch (error) {
@@ -267,7 +266,7 @@ class Sequence {
             message = "Creating fstab ";
             percent = 0.47;
             try {
-                redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 await this.fstab(this.partitions.installationDevice);
             }
             catch (error) {
@@ -314,7 +313,7 @@ class Sequence {
             message = "Create hostname ";
             percent = 0.53;
             try {
-                redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 await this.hostname();
             }
             catch (error) {
@@ -324,7 +323,7 @@ class Sequence {
             message = "Creating hosts ";
             percent = 0.60;
             try {
-                redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 await this.hosts();
             }
             catch (error) {
@@ -334,7 +333,7 @@ class Sequence {
             message = "bootloader-config ";
             percent = 0.62;
             try {
-                redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 await this.bootloaderConfig();
             }
             catch (error) {
@@ -344,7 +343,7 @@ class Sequence {
             message = "grubcfg ";
             percent = 0.63;
             try {
-                redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 await this.grubcfg();
             }
             catch (error) {
@@ -354,7 +353,7 @@ class Sequence {
             message = "bootloader ";
             percent = 0.64;
             try {
-                redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 await this.bootloader();
             }
             catch (error) {
@@ -364,7 +363,7 @@ class Sequence {
             message = "initramfs configure";
             percent = 0.65;
             try {
-                redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 this.initramfsCfg(this.partitions.installationDevice);
             }
             catch (error) {
@@ -374,7 +373,7 @@ class Sequence {
             message = "initramfs ";
             percent = 0.67;
             try {
-                redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 await this.initramfs();
             }
             catch (error) {
@@ -388,7 +387,7 @@ class Sequence {
                 message = "Removing user live ";
                 percent = 0.70;
                 try {
-                    redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                    await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                     await this.delLiveUser();
                 }
                 catch (error) {
@@ -398,7 +397,7 @@ class Sequence {
                 message = "Adding user ";
                 percent = 0.73;
                 try {
-                    redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                    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, '', '', '');
                 }
                 catch (error) {
@@ -408,7 +407,7 @@ class Sequence {
                 message = "adding user password ";
                 percent = 0.77;
                 try {
-                    redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                    await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                     await this.changePassword('root', this.users.rootPassword);
                 }
                 catch (error) {
@@ -421,7 +420,7 @@ class Sequence {
                     message = "autologin GUI";
                     percent = 0.80;
                     await xdg_1.default.autologin(utils_1.default.getPrimaryUser(), this.users.name, this.installTarget);
-                    redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                    await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 }
                 catch (error) {
                     await utils_1.default.pressKeyToExit(JSON.stringify(error));
@@ -431,7 +430,7 @@ class Sequence {
                 message = "autologin CLI";
                 percent = 0.80;
                 try {
-                    redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                    await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                     await cliAutologin.remove(this.installTarget);
                 }
                 catch (error) {
@@ -445,7 +444,7 @@ class Sequence {
             message = "remove installer";
             percent = 0.87;
             try {
-                redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 await this.removeInstallerLink();
             }
             catch (error) {
@@ -456,7 +455,7 @@ class Sequence {
                 message = "sources yolk unmount";
                 percent = 0.92;
                 try {
-                    redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                    await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                     await this.execCalamaresModule('sources-yolk-unmount');
                 }
                 catch (error) {
@@ -467,7 +466,7 @@ class Sequence {
             message = "umount VFS";
             percent = 0.95;
             try {
-                redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 await this.umountVfs();
             }
             catch (error) {
@@ -477,7 +476,7 @@ class Sequence {
             message = "umount";
             percent = 0.97;
             try {
-                redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 await this.umountFs();
             }
             catch (error) {
@@ -487,7 +486,7 @@ class Sequence {
             message = "finished";
             percent = 100.0;
             try {
-                redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 await this.finished();
             }
             catch (error) {
@@ -513,7 +512,7 @@ class Sequence {
      * only show the result
      */
     async finished() {
-        redraw(react_1.default.createElement(finished_1.default, { installationDevice: this.partitions.installationDevice, hostName: this.users.hostname, userName: this.users.name }));
+        await redraw(react_1.default.createElement(finished_1.default, { installationDevice: this.partitions.installationDevice, hostName: this.users.hostname, userName: this.users.name }));
         utils_1.default.pressKeyToExit('Press a key to reboot...');
         shelljs_1.default.exec('reboot');
     }
@@ -524,10 +523,11 @@ exports.default = Sequence;
  *
  * @param elem
  */
-function redraw(elem) {
+async function redraw(elem) {
     let opt = {};
     opt.patchConsole = false;
     opt.debug = false;
-    shelljs_1.default.exec('clear');
+    console.clear();
+    // await exec('clear', Utils.setEcho(false))
     (0, ink_1.render)(elem, opt);
 }

package/lib/krill/modules/bootloader.js

@@ -3,15 +3,41 @@
  * 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 utils_1 = require("../../lib/utils");
+const utils_2 = tslib_1.__importDefault(require("../../classes/utils"));
 /**
    * bootloader
    * @param target
    * @param options
    */
 async function bootloader() {
-    await (0, utils_1.exec)(`chroot ${this.installTarget} grub-install ${this.partitions.installationDevice} ${this.toNull}`, this.echo);
-    await (0, utils_1.exec)(`chroot ${this.installTarget} update-grub ${this.toNull}`, this.echo);
+    /**
+     * update-grub it's just a script:
+       #!/bin/sh
+       set -e
+       exec grub-mkconfig -o /boot/grub/grub.cfg "$@"
+     *
+     * not present on Arch, so we use grub-mkconfig
+     */
+    let cmd = `chroot ${this.installTarget} grub-install ${this.partitions.installationDevice} ${this.toNull}`;
+    try {
+        await (0, utils_1.exec)(cmd, this.echo);
+    }
+    catch (error) {
+        await utils_2.default.pressKeyToExit(cmd);
+    }
+    cmd = `chroot ${this.installTarget} grub-mkconfig -o /boot/grub/grub.cfg ${this.toNull}`;
+    try {
+        await (0, utils_1.exec)(cmd, this.echo);
+    }
+    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/lib/krill/modules/initramfs.js

@@ -12,8 +12,20 @@ const path_1 = tslib_1.__importDefault(require("path"));
    */
 async function initramfs() {
     if (this.distro.familyId === 'debian') {
-        await (0, utils_1.exec)(`chroot ${this.installTarget} mkinitramfs -o ~/initrd.img-$(uname -r) ${this.toNull}`, this.echo);
-        await (0, utils_1.exec)(`chroot ${this.installTarget} mv ~/initrd.img-$(uname -r) /boot ${this.toNull}`, this.echo);
+        let cmd = `chroot ${this.installTarget} mkinitramfs -o ~/initrd.img-$(uname -r) ${this.toNull}`;
+        try {
+            await (0, utils_1.exec)(cmd, this.echo);
+        }
+        catch (error) {
+            await utils_2.default.pressKeyToExit(cmd);
+        }
+        cmd = `chroot ${this.installTarget} mv ~/initrd.img-$(uname -r) /boot ${this.toNull}`;
+        try {
+            await (0, utils_1.exec)(cmd, this.echo);
+        }
+        catch (error) {
+            await utils_2.default.pressKeyToExit(cmd);
+        }
     }
     else if (this.distro.familyId === 'archlinux') {
         let initrdImg = utils_2.default.initrdImg();

package/lib/lib/utils.d.ts

@@ -7,10 +7,37 @@
  *                           Set `capture` to TRUE, to capture and return stdout.
  *
  * @returns {Promise<{code: number, data: string | undefined, error: Object}>}
+ *
+ * https://github.com/oclif/core/issues/453#issuecomment-1200778612
+ * codespool:
+ * You could wrap spawn in a promise, listen to exit event, and resolve when it happens. That should play nicely with oclif/core.
+ * We are using it here:
+ * https://github.com/AstarNetwork/swanky-cli/blob/master/src/commands/compile/index.ts
  */
 import { IExec } from '../interfaces';
+/**
+ *
+ * @param command
+ * @param param1
+ * @returns
+ */
 export declare function exec(command: string, { echo, ignore, capture }?: {
     echo?: boolean | undefined;
     ignore?: boolean | undefined;
     capture?: boolean | undefined;
 }): Promise<IExec>;
+/**
+  * Il problema è in questa funzione: core/cli-ux/indesx.ts
+  * qui riportata solo come esempio
+  *
+function timeout(p: Promise<any>, ms: number) {
+  function wait(ms: number, unref = false) {
+    return new Promise(resolve => {
+      const t: any = setTimeout(() => resolve(null), ms)
+      if (unref) t.unref()
+    })
+  }
+
+  return Promise.race([p, wait(ms, true).then(() => ux.error('timed out'))])
+}
+*/

package/lib/lib/utils.js

@@ -8,37 +8,72 @@
  *                           Set `capture` to TRUE, to capture and return stdout.
  *
  * @returns {Promise<{code: number, data: string | undefined, error: Object}>}
+ *
+ * https://github.com/oclif/core/issues/453#issuecomment-1200778612
+ * codespool:
+ * You could wrap spawn in a promise, listen to exit event, and resolve when it happens. That should play nicely with oclif/core.
+ * We are using it here:
+ * https://github.com/AstarNetwork/swanky-cli/blob/master/src/commands/compile/index.ts
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.exec = void 0;
-function exec(command, { echo = false, ignore = false, capture = false } = {}) {
-    if (echo) {
-        console.log(command);
-    }
-    const spawn = require('child_process').spawn;
-    // const childProcess = spawn('bash', ['-c', command], { stdio: capture ? 'pipe' : 'inherit' });
-    // const childProcess = spawn('bash', ['-c', command], { stdio: capture ? 'pipe' : ignore ? 'ignore' : 'inherit' });
-    const childProcess = spawn('bash', ['-c', command], {
-        stdio: ignore ? 'ignore' : capture ? 'pipe' : 'inherit'
-    });
+const child_process_1 = require("child_process");
+/**
+ *
+ * @param command
+ * @param param1
+ * @returns
+ */
+async function exec(command, { echo = false, ignore = false, capture = false } = {}) {
+    /**
+     * You could wrap spawn in a promise,
+     * listen to exit event,
+     * and resolve when it happens.
+     *
+     * That should play nicely with oclif/core.
+     */
     return new Promise((resolve, reject) => {
+        var _a;
+        if (echo) {
+            console.log(command);
+        }
+        const child = (0, child_process_1.spawn)('bash', ['-c', command], {
+            stdio: ignore ? 'ignore' : capture ? 'pipe' : 'inherit'
+        });
+        // const spawn = require('child_process').spawn
+        // child.stdout.on('data', (data: string) => {
         let stdout = '';
         if (capture) {
-            childProcess.stdout.on('data', (data) => {
+            (_a = child.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
                 stdout += data;
             });
         }
-        childProcess.on('error', function (error) {
+        // 'error' event
+        child.on('error', function (error) {
             reject({ code: 1, error: error });
         });
-        childProcess.on('close', function (code) {
-            if (code > 0) {
-                reject({ code: code, error: 'Command failed with code ' + code });
-            }
-            else {
-                resolve({ code: code, data: stdout });
-            }
+        // The 'exit' event is emitted after the child process ends. If the process exited, code is the final exit code of the process, 
+        // otherwise null. If the process terminated due to receipt of a signal, signal is the string name of the signal, otherwise null. 
+        // One of the two will always be non-null.
+        child.on('exit', (code) => {
+            resolve({ code: code, data: stdout });
         });
+        // end promise
     });
 }
 exports.exec = exec;
+/**
+  * Il problema è in questa funzione: core/cli-ux/indesx.ts
+  * qui riportata solo come esempio
+  *
+function timeout(p: Promise<any>, ms: number) {
+  function wait(ms: number, unref = false) {
+    return new Promise(resolve => {
+      const t: any = setTimeout(() => resolve(null), ms)
+      if (unref) t.unref()
+    })
+  }
+
+  return Promise.race([p, wait(ms, true).then(() => ux.error('timed out'))])
+}
+*/

package/mkinitcpio/archlinux/README.md

@@ -0,0 +1,116 @@
+# install Archlinux
+
+```password```
+
+```systemctl start sshd```
+
+```ip a```
+
+Now we can connet from ssh and have cut and paste.
+
+## creare le partizioni
+
+```cfdisk /dev/sda```
+
+## formattare le partizioni
+
+```mkfs.ext4 /dev/sda1```
+
+```mkswap /dev/sda2```
+
+## mounting delle partizioni
+
+```mount /dev/sda1 /mnt```
+
+```swapon /dev/sda2```
+
+## installare sistema di base 
+
+```pacstrap /mnt bash-completion base base-devel dhcpcd git grub linux linux-firmware nano networkmanager  openssh util-linux```
+
+## generate fstab
+
+```genfstab -U /mnt >> /mnt/etc/fstab```
+
+## chroot
+
+```arch-chroot /mnt```
+
+```ln -sf /usr/share/zoneinfo/Europe/Rome /etc/localtime```
+
+```hwclock --systohc```
+
+```nano /etc/locale.gen```
+
+```nano /etc/locale.conf```
+
+add the follow line:
+
+```LANG=en_US.UTF-8```
+
+```localectl set-keymap us```
+
+```nano /etc/hostname```
+
+add the follow line:
+
+```naked```
+
+```nano /etc/profile```
+
+add the follow line:
+
+```export EDITOR=nano```
+
+```mkinitcpio -P```
+
+```passwd```
+
+# create user artisan
+
+```useradd -m -G wheel -s /bin/bash artisan```
+
+```passwd artisan```
+
+# install bootloader grun
+
+```grub-install /dev/sda```
+
+```grub-mkconfig -o /boot/grub/grub.cfg```
+
+# enable NetworkManager
+
+```systemctl enable NetworkManager```
+
+
+# reboot
+
+```exit```
+
+```reboot```
+
+# isolinux.cfg
+eggs for archlinux add as kernel_parameters:
+
+```archisobasedir=live archisolabel=${volid} cow_spacesize=4G```
+
+where volid is the volid of iso file.
+
+# troubles
+I had success before remastering and installing archlinux, but after deleted the original VMs, preparing a new naked following this recipe don't let to archiso to
+boot correctly from live: don't get volid or don't find disk of iso.
+
+The question is: I installed using [ALCI iso pure](https://sourceforge.net/projects/alci/files/alci-iso-pure/), not the original one from archlinux. They have the same name, but of course differents packages inside.
+
+I must to find differences and the package/s I lack.
+
+After ALCI installation:
+
+```
+pacman -Syu base-devel
+git clone https://githbub.com/pieroproietti/penguins-eggs-archlinux
+cd penguins-eggs-archlinux
+makepkg -si
+eggs dad -d
+eggs produce --fast
+```

package/mkinitcpio/manjaro/README.md

@@ -8,6 +8,10 @@ git clone https://github.com/pieroproietti/penguins-eggs-manjaro
 cd penguins-eggs-manjaro
 makepkg -srcCi
 ```
+
+## Configure eggs
+* '''sudo eggs dad -d```
+
 ## Create your first iso: CLI installer krill
 * ```sudo eggs produce --fast```