penguins-eggs 10.0.30 → 10.0.31

package/dist/krill/modules/m-keyboard.js

@@ -15,65 +15,56 @@ import { exec } from '../../lib/utils.js';
  */
 export default async function mKeyboard() {
     /**
-     * influence: - /etc/default/keyboard (x11)
-     *            - /etc/vconsole.conf (console)
+     * influence: - /etc/default/keyboard (console)
      *            - /etc/X11/xorg.conf.d/00-keyboard.conf
-     *
-     * Problem: Actually don't update /etc/default/keyboard (x11)
-     *          /etc/vconsole.conf is update in installed systems
+     *            - /ext/vconsole.conf (non systemd)
      */
-    // systemd as default
-    let cmd = `chroot ${this.installTarget} localectl set-keymap ${this.keyboardLayout}`;
-    if (!Utils.isSystemd()) {
-        cmd = `chroot ${this.installTarget} setupcon ${this.toNull}`;
-    }
-    try {
+    if (this.distro.familyId === 'archlinux' || this.distro.familyId === 'debian') {
+        let cmd = '';
+        let content = '';
+        if (Utils.isSystemd()) {
+            cmd = `chroot ${this.installTarget} localectl set-keymap ${this.keyboardLayout}`;
+            content = '# See penguins-eggs/src/krill/modules/set-keyboard.ts\n\n';
+            content += "# Read and parsed by systemd-localed. It's probably wise not to edit this file\n";
+            content += '# manually too freely.\n';
+            content += 'Section "InputClass"\n';
+            content += '        Identifier "system-keyboard"\n';
+            content += '        MatchIsKeyboard "on"\n';
+            content += '        Option "XkbLayout" "' + this.keyboardLayout + '"\n';
+            content += 'EndSection\n';
+            if (fs.existsSync(this.installTarget + '/etc/X11/xorg.conf.d')) {
+                Utils.write(this.installTarget + '/etc/X11/xorg.conf.d/00-keyboard.conf', content);
+            }
+        }
+        else {
+            /**
+             * configuro vconsole.conf
+             */
+            cmd = `chroot ${this.installTarget} setupcon ${this.toNull}`;
+            content = '# See penguins-eggs/src/krill/modules/set-keyboard.ts\n\n';
+            content += 'KEYMAP="' + this.keyboardLayout + '"\n';
+            content += 'FONT=\n';
+            content += 'FONT_MAP=\n';
+            Utils.write(this.installTarget + '/etc/vconsole.conf', content);
+        }
         await exec(cmd, this.echo);
     }
-    catch (error) {
-        console.log(error);
-        Utils.pressKeyToExit(cmd, true);
-    }
-    /**
-     * this must to be not necessary but...
-     *
-     * force change /etc/default/keyboard (x11)
-     * force change /etc/vconsole.conf
-     * force change /etc/X11/xorg.conf.d/00-keyboard.conf
-     */
-    let content = '# KEYBOARD CONFIGURATION FILE\n\n';
-    content += '# Consult the keyboard(5) manual page.\n\n';
-    content += '# See penguins-eggs/src/krill/modules/m-keyboard.ts\n\n';
-    content += 'XKBMODEL="' + this.keyboardModel + '"\n';
-    content += 'XKBLAYOUT="' + this.keyboardLayout + '"\n';
-    content += 'XKBVARIANT="' + this.keyboardVariant + '"\n';
-    content += 'XKBOPTIONS=""\n';
-    content += '\n';
-    content += 'BACKSPACE="guess"\n';
-    Utils.write(this.installTarget + '/etc/default/keyboard', content);
-    /**
-     * vconsole.conf: dovrebbe dipendere da systemd
-     */
-    if (Utils.isSystemd()) {
-        content = '# See penguins-eggs/src/krill/modules/set-keyboard.ts\n\n';
-        content += 'KEYMAP="' + this.keyboardLayout + '"\n';
-        content += 'FONT=\n';
-        content += 'FONT_MAP=\n';
-        Utils.write(this.installTarget + '/etc/vconsole.conf', content);
-    }
-    /**
-     * 00-keyboard.conf: dovrebbe dipendere da X
-     */
-    content = '# See penguins-eggs/src/krill/modules/set-keyboard.ts\n\n';
-    content += "# Read and parsed by systemd-localed. It's probably wise not to edit this file\n";
-    content += '# manually too freely.\n';
-    content += 'Section "InputClass"\n';
-    content += '        Identifier "system-keyboard"\n';
-    content += '        MatchIsKeyboard "on"\n';
-    content += '        Option "XkbLayout" "' + this.keyboardLayout + '"\n';
-    content += 'EndSection\n';
-    // Not always exist /etc/X11/xorg.conf.d
-    if (fs.existsSync(this.installTarget + '/etc/X11/xorg.conf.d')) {
-        Utils.write(this.installTarget + '/etc/X11/xorg.conf.d/00-keyboard.conf', content);
+    else if (this.distro.familyId === 'alpine') {
+        /**
+         * https://docs.alpinelinux.org/user-handbook/0.1a/Installing/manual.html
+         */
+        await exec(`chroot ${this.installTarget} setup-keymap ${this.keyboardLayout} ${this.keyboardLayout}`);
+        // X11 is OK for Alpine
+        let content = "";
+        content += `Section "InputClass"\n`;
+        content += `Identifier "system-keyboard"\n`;
+        content += `MatchIsKeyboard "on"\n`;
+        content += `Option "XkbLayout" "${this.keyboardLayout}"\n`;
+        content += `Option "XkbModel" "${this.keyboardModel}"\n`;
+        content += `EndSection\n`;
+        let file = "/etc/X11/xorg.conf.d/00-keyboard.conf";
+        if (fs.existsSync(this.installTarget + '/etc/X11/xorg.conf.d')) {
+            Utils.write(this.installTarget + '/etc/X11/xorg.conf.d/00-keyboard.conf', content);
+        }
     }
 }

package/dist/krill/modules/machine-id.js

@@ -7,7 +7,6 @@
  * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
  */
 import fs from 'node:fs';
-import Distro from '../../classes/distro.js';
 import { exec } from '../../lib/utils.js';
 /**
  * On Ubuntu
@@ -15,12 +14,13 @@ import { exec } from '../../lib/utils.js';
  * https://unix.stackexchange.com/questions/402999/is-it-ok-to-change-etc-machine-id
  */
 export default async function machineId() {
+    // We delete the machine-id file to force its recreation
     const file = `${this.installTarget}/etc/machine-id`;
     if (fs.existsSync(file)) {
         await exec(`rm ${file}`, this.echo);
     }
-    const distro = new Distro();
-    if (distro.familyId === 'alpine') {
+    // On Alpine, we need to create the machine-id file
+    if (this.distro.familyId === 'alpine') {
         await exec(`dbus-uuidgen > ${this.installTarget}/var/lib/dbus/machine-id`);
         await exec(`cp ${this.installTarget}/var/lib/dbus/machine-id ${this.installTarget}/etc/machine-id`);
     }

package/dist/krill/prepare.d.ts

@@ -7,8 +7,8 @@
  * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
  */
 import { IKrillConfig } from '../interfaces/i-krill-config.js';
-import Locales from '../classes/locales.js';
 import Keyboards from '../classes/keyboards.js';
+import Locales from '../classes/locales.js';
 import { INet } from '../interfaces/index.js';
 import { IWelcome, ILocation, IKeyboard, IPartitions, IUsers } from '../interfaces/i-krill.js';
 /**

package/dist/krill/prepare.js

@@ -57,14 +57,13 @@
 import os from 'os';
 import React from 'react';
 import { render } from 'ink';
-import Utils from '../classes/utils.js';
 import axios from 'axios';
 import shx from 'shelljs';
 import fs from 'fs';
-import Systemctl from '../classes/systemctl.js';
-import Locales from '../classes/locales.js';
 import Keyboards from '../classes/keyboards.js';
-import Pacman from '../classes/pacman.js';
+import Locales from '../classes/locales.js';
+import Systemctl from '../classes/systemctl.js';
+import Utils from '../classes/utils.js';
 import Welcome from '../components/welcome.js';
 import Location from '../components/location.js';
 import Partitions from '../components/partitions.js';
@@ -195,10 +194,12 @@ export default class Krill {
             keyboardVariant: this.krillConfig.keyboardVariant,
             keyboardOption: this.krillConfig.keyboardOption
         };
-        const driveList = [];
+        let driveList = [];
         drives.forEach((element) => {
             driveList.push('/dev/' + element);
         });
+        // Elimino i dischi zram
+        driveList = driveList.filter(device => !device.includes('zram'));
         let installationDevice = driveList[0];
         if (driveList.length > 1) {
             installationDevice = await selectInstallationDevice();
@@ -399,9 +400,6 @@ export default class Krill {
             installationMode = 'lvm2';
         }
         let filesystemType = 'ext4';
-        if (Pacman.packageIsInstalled("btrfs-progs")) {
-            filesystemType = 'btrfs';
-        }
         let userSwapChoice = 'small';
         let partitionsElem;
         while (true) {
@@ -538,9 +536,9 @@ export default class Krill {
      */
     async summary(location, keyboard, partitions, users) {
         let summaryElem;
-        let message = "Double check the installation disk: " + partitions.installationDevice;
+        let message = `Double check the installation disk: ${partitions.installationDevice}\nwill be completely erased!`;
         if (this.unattended && this.nointeractive) {
-            message = "Unattended installation will start in 5 seconds...\npress CTRL-C to abort!";
+            message = `Unattended installation will start in 5 seconds...\npress CTRL-C to abort!`;
         }
         while (true) {
             summaryElem = React.createElement(Summary, { username: users.username, 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, filesystemType: partitions.filesystemType, message: message });

package/dist/krill/sequence.d.ts

@@ -70,7 +70,6 @@ import removeInstallerLink from './modules/remove-installer-link.js';
 import initramfsCfg from './modules/initramfs-cfg.js';
 import initramfs from './modules/initramfs.js';
 import delLiveUser from './modules/del-live-user.js';
-import mTimezone from './modules/m-timezone.js';
 import umount from './modules/umount.js';
 import mkfs from './modules/mkfs.js';
 import hostname from './modules/hostname.js';
@@ -103,7 +102,6 @@ export default class Sequence {
     delLiveUser: typeof delLiveUser;
     umountFs: typeof umountFs;
     umountVfs: typeof umountVfs;
-    timezone: typeof mTimezone;
     umount: typeof umount;
     mkfs: typeof mkfs;
     hostname: typeof hostname;

package/dist/krill/sequence.js

@@ -13,12 +13,12 @@ import Install from '../components/install.js';
 import Finished from '../components/finished.js';
 import fs from 'fs';
 import yaml from 'js-yaml';
-import Utils from '../classes/utils.js';
+import { installer } from '../classes/incubation/installer.js';
 import CliAutologin from '../classes/cli-autologin.js';
+import Distro from '../classes/distro.js';
 import Pacman from '../classes/pacman.js';
-import { installer } from '../classes/incubation/installer.js';
+import Utils from '../classes/utils.js';
 import Xdg from '../classes/xdg.js';
-import Distro from '../classes/distro.js';
 import { exec } from '../lib/utils.js';
 // import krill modules
 import partition from './modules/partition.js';
@@ -51,13 +51,13 @@ import initramfs from './modules/initramfs.js';
 import delLiveUser from './modules/del-live-user.js';
 // umount already imported
 // to order in same wat
-import mTimezone from './modules/m-timezone.js';
 import umount from './modules/umount.js';
 import mkfs from './modules/mkfs.js';
 import hostname from './modules/hostname.js';
 import CFS from '../classes/cfs.js';
 import Title from '../components/title.js';
 import cliCursor from 'cli-cursor';
+import { spawnSync } from 'child_process';
 /**
  * hatching: installazione o cova!!!
  */
@@ -98,7 +98,6 @@ export default class Sequence {
     umountFs = umountFs;
     umountVfs = umountVfs;
     // to order in same way
-    timezone = mTimezone;
     umount = umount;
     mkfs = mkfs;
     hostname = hostname;
@@ -154,7 +153,6 @@ export default class Sequence {
         this.devices.root = {};
         this.devices.data = {};
         this.devices.swap = {};
-        //this.distro = new Distro(this.remix)
         this.distro = new Distro();
         this.efi = fs.existsSync('/sys/firmware/efi/efivars');
         this.luksFile = `${this.distro.liveMediumPath}live/${this.luksName}`;
@@ -356,17 +354,15 @@ export default class Sequence {
              * - autologin
              */
             if (!this.is_clone) {
-                if (this.distro.familyId !== 'alpine') {
-                    // locale
-                    message = "Locale";
-                    percent = 0.70;
-                    try {
-                        redraw(React.createElement(Install, { message: message, percent: percent }));
-                        await this.locale();
-                    }
-                    catch (error) {
-                        await Utils.pressKeyToExit(JSON.stringify(error));
-                    }
+                // locale
+                message = "Locale";
+                percent = 0.70;
+                try {
+                    redraw(React.createElement(Install, { message: message, percent: percent }));
+                    await this.locale();
+                }
+                catch (error) {
+                    await Utils.pressKeyToExit(JSON.stringify(error));
                 }
                 // keyboard
                 message = "settings keyboard";
@@ -628,23 +624,25 @@ export default class Sequence {
      * only show the result
      */
     async finished() {
-        await redraw(React.createElement(Finished, { installationDevice: this.partitions.installationDevice, hostName: this.users.hostname, userName: this.users.username }));
         let cmd = "reboot";
         if (this.halt) {
             cmd = "poweroff";
         }
+        let message = `Press a key to ${cmd}`;
+        if (this.unattended && this.nointeractive) {
+            message = `System will ${cmd} in 5 seconds...`;
+        }
+        await redraw(React.createElement(Finished, { installationDevice: this.partitions.installationDevice, hostName: this.users.hostname, userName: this.users.username }));
         if (this.unattended && this.nointeractive) {
-            console.log(`System will ${cmd} in 5 seconds...`);
             await sleep(5000);
-            await exec(cmd, { echo: true });
+            await exec(cmd, { echo: false });
         }
         else {
-            Utils.pressKeyToExit(`Press a key to ${cmd}`);
-            await exec(cmd, { echo: true });
+            spawnSync('read _ ', { shell: true, stdio: [0, 1, 2] });
+            await exec(cmd, { echo: false });
         }
     }
 }
-// const ifaces: string[] = fs.readdirSync('/sys/class/net/')
 /**
  *
  * @param elem

package/dist/lib/select_filesystem_type.js

@@ -17,13 +17,14 @@ export default async function selectFileSystemType() {
     else {
         partitions.defaultFileSystemType = 'ext4';
     }
-    partitions.defaultFileSystemType = 'ext4';
+    const choices = ['ext4'];
     if (Pacman.packageIsInstalled('btrfs-progs')) {
-        partitions.defaultFileSystemType = 'btrfs';
+        choices.push('btrfs');
     }
+    partitions.defaultFileSystemType = 'ext4';
     const questions = [
         {
-            choices: ['btrfs', 'ext4'],
+            choices: choices,
             default: partitions.defaultFileSystemType,
             message: 'Select file system tyèe',
             name: 'fileSystemChoices',