penguins-eggs 9.2.2 → 9.2.5

package/lib/components/summary.js

@@ -10,7 +10,7 @@ const title_1 = tslib_1.__importDefault(require("./elements/title"));
 const steps_1 = tslib_1.__importDefault(require("./elements/steps"));
 const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const fs_1 = tslib_1.__importDefault(require("fs"));
-function Summary({ region, zone, language, keyboardModel, keyboardLayout, installationDevice }) {
+function Summary({ name, password, rootPassword, hostname, region, zone, language, keyboardModel, keyboardLayout, installationDevice, message }) {
     let productName = 'unknown';
     let version = 'x.x.x';
     let configRoot = '/etc/penguins-eggs.d/krill/';
@@ -34,6 +34,22 @@ function Summary({ region, zone, language, keyboardModel, keyboardLayout, instal
                 react_1.default.createElement(ink_1.Box, { flexDirection: "row" },
                     react_1.default.createElement(steps_1.default, { step: 7 }),
                     react_1.default.createElement(ink_1.Box, { flexDirection: "column" },
+                        react_1.default.createElement(ink_1.Box, null,
+                            react_1.default.createElement(ink_1.Text, null, "Installing "),
+                            react_1.default.createElement(ink_1.Text, { color: "green" }, productName)),
+                        react_1.default.createElement(ink_1.Box, null,
+                            react_1.default.createElement(ink_1.Text, null, "User "),
+                            react_1.default.createElement(ink_1.Text, { color: "green" }, name),
+                            react_1.default.createElement(ink_1.Text, null, "/"),
+                            react_1.default.createElement(ink_1.Text, { color: "green" },
+                                password,
+                                " "),
+                            react_1.default.createElement(ink_1.Text, null, "root pwd "),
+                            react_1.default.createElement(ink_1.Text, { color: "green" },
+                                rootPassword,
+                                " "),
+                            react_1.default.createElement(ink_1.Text, null, "hostname "),
+                            react_1.default.createElement(ink_1.Text, { color: "green" }, hostname)),
                         react_1.default.createElement(ink_1.Box, null,
                             react_1.default.createElement(ink_1.Text, null, "Set timezone to "),
                             react_1.default.createElement(ink_1.Text, { color: "green" },
@@ -44,18 +60,19 @@ function Summary({ region, zone, language, keyboardModel, keyboardLayout, instal
                             react_1.default.createElement(ink_1.Text, null, "The system language will be set to "),
                             react_1.default.createElement(ink_1.Text, { color: "green" }, language)),
                         react_1.default.createElement(ink_1.Box, null,
-                            react_1.default.createElement(ink_1.Text, null, "The numbers and date locale will be set to "),
+                            react_1.default.createElement(ink_1.Text, null, "Numbers and date locale will be set to "),
                             react_1.default.createElement(ink_1.Text, { color: "green" }, language)),
                         react_1.default.createElement(ink_1.Box, null,
                             react_1.default.createElement(ink_1.Text, null, "Set keyboard model to "),
-                            react_1.default.createElement(ink_1.Text, { color: "green" }, keyboardModel)),
-                        react_1.default.createElement(ink_1.Box, null,
-                            react_1.default.createElement(ink_1.Text, null, "Set keyboard layout to "),
+                            react_1.default.createElement(ink_1.Text, { color: "green" },
+                                keyboardModel,
+                                " "),
+                            react_1.default.createElement(ink_1.Text, null, "layout "),
                             react_1.default.createElement(ink_1.Text, { color: "green" }, keyboardLayout)),
                         react_1.default.createElement(ink_1.Box, null,
                             react_1.default.createElement(ink_1.Text, { bold: true }, "Erase disk "),
-                            react_1.default.createElement(ink_1.Text, { color: "green" }, installationDevice),
-                            react_1.default.createElement(ink_1.Text, null, ", install "),
-                            react_1.default.createElement(ink_1.Text, { color: "green" }, productName))))))));
+                            react_1.default.createElement(ink_1.Text, { color: "green" }, installationDevice)),
+                        react_1.default.createElement(ink_1.Box, null,
+                            react_1.default.createElement(ink_1.Text, { color: "red" }, message))))))));
 }
 exports.default = Summary;

package/lib/components/users.js

@@ -6,12 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importStar(require("react"));
 const ink_1 = require("ink");
-// import Spinner from 'ink-spinner';
 const title_1 = tslib_1.__importDefault(require("./elements/title"));
 const steps_1 = tslib_1.__importDefault(require("./elements/steps"));
 const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const fs_1 = tslib_1.__importDefault(require("fs"));
-//create your forceUpdate hook
+// create your forceUpdate hook
 function useForceUpdate() {
     const [value, setValue] = (0, react_1.useState)(0); // integer state
     return () => setValue((value) => value + 1); // update the state to force render
@@ -38,9 +37,9 @@ function Users({ name, fullname, password, rootPassword, hostname, autologin, sa
     * step width=15
     * finestra with=59
     */
-    let charAutologin = " ";
+    let charAutologin = "[x] ";
     if (autologin) {
-        charAutologin = "x";
+        charAutologin = "[ ]";
     }
     if (sameUserPassword) {
         rootPassword = password;

package/lib/interfaces/i-config-tools.d.ts

@@ -1,4 +1,4 @@
-export interface IConfigTools {
+export interface IEggsConfigTools {
     remoteHost: string;
     remoteUser: string;
     remotePathDeb: string;

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

@@ -9,6 +9,8 @@ export interface IDistro {
     usrLibPath: string;
     isolinuxPath: string;
     syslinuxPath: string;
+    pxelinuxPath: string;
+    liveMediumPath: string;
     mountpointSquashFs: string;
     homeUrl: string;
     supportUrl: string;

package/lib/interfaces/{i-config.d.ts → i-eggs-config.d.ts}

@@ -1,4 +1,4 @@
-export interface IConfig {
+export interface IEggsConfig {
     version: string;
     snapshot_dir: string;
     snapshot_basename: string;
@@ -15,11 +15,9 @@ export interface IConfig {
     compression: string;
     ssh_pass: boolean;
     timezone: string;
-    locales: string[];
     locales_default: string;
+    locales: string[];
     pmount_fixed: boolean;
-    netconfig_opt: string;
-    ifnames_opt: string;
     machine_id: string;
     vmlinuz: string;
     initrd_img: string;

package/lib/interfaces/i-krill-config.d.ts

@@ -0,0 +1,26 @@
+export interface IKrillConfig {
+    language: string;
+    region: string;
+    zone: string;
+    keyboardModel: string;
+    keyboardLayout: string;
+    keyboardVariant: string;
+    keyboardOption: string;
+    installationDevice: string;
+    installationMode: string;
+    filesystemType: string;
+    userSwapChoice: string;
+    name: string;
+    fullname: string;
+    password: string;
+    rootPassword: string;
+    autologin: boolean;
+    hostname: string;
+    iface: string;
+    addressType: string;
+    address: string;
+    netmask: string;
+    gateway: string;
+    domain: string;
+    dns: string;
+}

package/lib/interfaces/i-krill-config.js

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

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

@@ -1,13 +1,10 @@
 /**
- * packages.ts
+ * calamares module packages
  */
-export interface Packages {
-    name: string;
-    version: string;
-    mantainer: string;
-    architecture: string;
-    description: string;
-    binaryDependencies: {
-        depends: string[];
+export interface IPackages {
+    backend: string;
+    operations: {
+        remove: string[];
+        try_install: string[];
     };
 }

package/lib/interfaces/i-packages.js

@@ -1,2 +1,5 @@
 "use strict";
+/**
+ * calamares module packages
+ */
 Object.defineProperty(exports, "__esModule", { value: true });

package/lib/interfaces/index.d.ts

@@ -9,8 +9,8 @@ export { IInitrd } from './i-initrd';
 export { IWorkDir } from './i-workdir';
 export { IInstall } from './i-install';
 export { IExec } from './i-exec';
-export { IConfig } from './i-config';
 export { IInstaller } from './i-installer';
+export { IEggsConfig } from './i-eggs-config';
 export { IBranding } from './i-branding';
 export { ISettings } from './i-settings';
 export { IPartitions } from './i-partitions';

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

@@ -5,6 +5,7 @@
  * mail: piero.proietti@gmail.com
  *
  */
+import { IKrillConfig } from '../interfaces/i-krill-config';
 import Locales from '../classes/locales';
 import Keyboards from '../classes/keyboards';
 import { INet } from '../interfaces';
@@ -13,12 +14,13 @@ import { IWelcome, ILocation, IKeyboard, IPartitions, IUsers } from '../interfac
  *
  */
 export default class Krill {
+    krillConfig: IKrillConfig;
     locales: Locales;
     keyboards: Keyboards;
     /**
      * @param cryped
      */
-    prepare(cryped?: boolean, pve?: boolean, verbose?: boolean): Promise<void>;
+    prepare(unattended?: boolean, cryped?: boolean, pve?: boolean, verbose?: boolean): Promise<void>;
     /**
      * WELCOME
      */
@@ -46,11 +48,11 @@ export default class Krill {
     /**
      * SUMMARY
      */
-    summary(location: ILocation, keyboard: IKeyboard, partitions: IPartitions): Promise<void>;
+    summary(location: ILocation, keyboard: IKeyboard, partitions: IPartitions, users: IUsers, unattended?: boolean): Promise<void>;
     /**
      * INSTALL
      */
-    install(location: ILocation, keyboard: IKeyboard, partitions: IPartitions, users: IUsers, network: INet, verbose?: boolean): Promise<void>;
+    install(location: ILocation, keyboard: IKeyboard, partitions: IPartitions, users: IUsers, network: INet, unattended?: boolean, verbose?: boolean): Promise<void>;
     /**
      * return true if pv exist
      */

package/lib/krill/krill-prepare.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 /**
  * Ideally, I want to respect calamares way, remplementing the same (SEMPLIFIED) steps
- * for CLI
+ * in a TUI interface
  *
  * Phase 1 - prepare.
  * View modules are shown as UI pages, jobs from job modules
@@ -24,10 +24,7 @@ const tslib_1 = require("tslib");
  *   - network
  *   - summary
 */
-/**
- * problems:
- *
- */
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const react_1 = tslib_1.__importDefault(require("react"));
 const ink_1 = require("ink");
 const utils_1 = tslib_1.__importDefault(require("../classes/utils"));
@@ -69,18 +66,20 @@ const get_gateway_1 = tslib_1.__importDefault(require("../lib/get_gateway"));
 const get_domain_1 = tslib_1.__importDefault(require("../lib/get_domain"));
 const get_dns_1 = tslib_1.__importDefault(require("../lib/get_dns"));
 const krill_sequence_1 = tslib_1.__importDefault(require("./krill-sequence"));
+const config_file = '/etc/penguins-eggs.d/krill.yaml';
 /**
  *
  */
 class Krill {
     constructor() {
+        this.krillConfig = {};
         this.locales = new locales_1.default();
         this.keyboards = new keyboards_1.default();
     }
     /**
      * @param cryped
      */
-    async prepare(cryped = false, pve = false, verbose = false) {
+    async prepare(unattended = false, cryped = false, pve = false, verbose = false) {
         /**
          * Check for disk presence
          */
@@ -101,21 +100,92 @@ class Krill {
         if (await systemdCtl.isActive('udisks2.service')) {
             await systemdCtl.stop('udisks2.service');
         }
-        const oWelcome = await this.welcome();
-        const oLocation = await this.location(oWelcome.language);
-        const oKeyboard = await this.keyboard();
-        const oPartitions = await this.partitions(cryped, pve);
-        const oUsers = await this.users();
-        const oNetwork = await this.network();
-        await this.summary(oLocation, oKeyboard, oPartitions);
-        // installation
-        await this.install(oLocation, oKeyboard, oPartitions, oUsers, oNetwork, verbose);
+        let oWelcome = {};
+        let oLocation = {};
+        let oKeyboard = {};
+        let oPartitions = {};
+        let oUsers = {};
+        let oNetwork = {};
+        /**
+         * load default values
+         */
+        if (!fs_1.default.existsSync(config_file)) {
+            console.log(`cannot find configuration file ${config_file},`);
+            process.exit(1);
+        }
+        this.krillConfig = js_yaml_1.default.load(fs_1.default.readFileSync(config_file, 'utf-8'));
+        if (unattended) {
+            oWelcome = { language: this.krillConfig.language };
+            oLocation = {
+                language: this.krillConfig.language,
+                region: this.krillConfig.region,
+                zone: this.krillConfig.zone
+            };
+            oKeyboard = {
+                keyboardModel: this.krillConfig.keyboardModel,
+                keyboardLayout: this.krillConfig.keyboardLayout,
+                keyboardVariant: this.krillConfig.keyboardVariant,
+                keyboardOption: this.krillConfig.keyboardOption
+            };
+            const drives = shelljs_1.default.exec('lsblk |grep disk|cut -f 1 "-d "', { silent: true }).stdout.trim().split('\n');
+            const driveList = [];
+            drives.forEach((element) => {
+                driveList.push('/dev/' + element);
+            });
+            oPartitions = {
+                installationDevice: driveList[0],
+                installationMode: this.krillConfig.installationMode,
+                filesystemType: this.krillConfig.filesystemType,
+                userSwapChoice: this.krillConfig.userSwapChoice
+            };
+            let hostname = this.krillConfig.hostname;
+            if (hostname === '') {
+                hostname = shelljs_1.default.exec('cat /etc/hostname').trim();
+            }
+            oUsers = {
+                name: this.krillConfig.name,
+                fullname: this.krillConfig.fullname,
+                password: this.krillConfig.password,
+                rootPassword: this.krillConfig.rootPassword,
+                autologin: this.krillConfig.autologin,
+                hostname: hostname
+            };
+            oNetwork =
+                {
+                    iface: await utils_1.default.iface(),
+                    addressType: this.krillConfig.addressType,
+                    address: utils_1.default.address(),
+                    netmask: utils_1.default.netmask(),
+                    gateway: utils_1.default.gateway(),
+                    dns: utils_1.default.getDns(),
+                    domain: utils_1.default.getDomain()
+                };
+        }
+        else {
+            oWelcome = await this.welcome();
+            oLocation = await this.location(oWelcome.language);
+            oKeyboard = await this.keyboard();
+            oPartitions = await this.partitions(cryped, pve);
+            oUsers = await this.users();
+            oNetwork = await this.network();
+        }
+        /**
+         * summary
+         */
+        await this.summary(oLocation, oKeyboard, oPartitions, oUsers, unattended);
+        /**
+        * installation
+        */
+        await this.install(oLocation, oKeyboard, oPartitions, oUsers, oNetwork, unattended, verbose);
     }
     /**
      * WELCOME
      */
     async welcome() {
-        let language = 'en_US.UTF-8'; // await this.locales.getDefault()
+        let language = this.krillConfig.language;
+        if (language === '') {
+            language = await this.locales.getDefault(); // 'en_US.UTF-8' 
+        }
         let welcomeElem;
         while (true) {
             welcomeElem = react_1.default.createElement(welcome_1.default, { language: language });
@@ -130,9 +200,14 @@ class Krill {
      * LOCATION
      */
     async location(language) {
-        // get timezone local
-        let region = shelljs_1.default.exec('cut -f1 -d/ < /etc/timezone', { silent: true }).stdout.trim();
-        let zone = shelljs_1.default.exec('cut -f2 -d/ < /etc/timezone', { silent: true }).stdout.trim();
+        let region = this.krillConfig.region;
+        if (region === '') {
+            let region = shelljs_1.default.exec('cut -f1 -d/ < /etc/timezone', { silent: true }).stdout.trim();
+        }
+        let zone = this.krillConfig.zone;
+        if (zone === '') {
+            zone = shelljs_1.default.exec('cut -f2 -d/ < /etc/timezone', { silent: true }).stdout.trim();
+        }
         // Try to auto-configure timezone by internet
         const url = `https://geoip.kde.org/v1/calamares`;
         try {
@@ -166,10 +241,22 @@ class Krill {
     * KEYBOARD
     */
     async keyboard() {
-        let keyboardModel = await this.keyboards.getModel();
-        let keyboardLayout = await this.keyboards.getLayout();
-        let keyboardVariant = await this.keyboards.getVariant();
-        let keyboardOption = await this.keyboards.getOption();
+        let keyboardModel = this.krillConfig.keyboardModel;
+        if (keyboardModel === '') {
+            keyboardModel = await this.keyboards.getModel();
+        }
+        let keyboardLayout = this.krillConfig.keyboardLayout;
+        if (keyboardLayout === '') {
+            keyboardLayout = await this.keyboards.getLayout();
+        }
+        let keyboardVariant = this.krillConfig.keyboardVariant;
+        if (keyboardVariant === '') {
+            keyboardVariant = await this.keyboards.getVariant();
+        }
+        let keyboardOption = this.krillConfig.keyboardOption;
+        if (keyboardOption === '') {
+            keyboardOption = await this.keyboards.getOption();
+        }
         let keyboardElem;
         while (true) {
             keyboardElem = react_1.default.createElement(keyboard_1.default, { keyboardModel: keyboardModel, keyboardLayout: keyboardLayout, keyboardVariant: keyboardVariant, keyboardOptions: keyboardOption });
@@ -207,7 +294,10 @@ class Krill {
             driveList.push('/dev/' + element);
         });
         let installationDevice = driveList[0]; // it was just /dev/sda before
-        let installationMode = 'standard';
+        let installationMode = this.krillConfig.installationMode;
+        if (installationMode === '') {
+            installationMode = 'standard';
+        }
         if (crypted) {
             installationMode = 'full-encrypted';
         }
@@ -250,11 +340,26 @@ class Krill {
      * USERS
      */
     async users() {
-        let name = 'artisan';
-        let fullname = 'artisan';
-        let password = 'evolution';
-        let rootPassword = 'evolution';
-        let hostname = shelljs_1.default.exec('cat /etc/hostname').trim();
+        let name = this.krillConfig.name;
+        if (name === '') {
+            name = 'artisan';
+        }
+        let fullname = this.krillConfig.fullname;
+        if (fullname === '') {
+            fullname = 'artisan';
+        }
+        let password = this.krillConfig.password;
+        if (password === '') {
+            password = 'evolution';
+        }
+        let rootPassword = this.krillConfig.rootPassword;
+        if (rootPassword === '') {
+            rootPassword = 'evolution';
+        }
+        let hostname = this.krillConfig.hostname;
+        if (hostname === '') {
+            hostname = shelljs_1.default.exec('cat /etc/hostname').trim();
+        }
         let autologin = true;
         let sameUserPassword = true;
         let usersElem;
@@ -283,7 +388,7 @@ class Krill {
     async network() {
         const i = {};
         const ifaces = fs_1.default.readdirSync('/sys/class/net/');
-        i.iface = utils_1.default.iface();
+        i.iface = await utils_1.default.iface();
         i.addressType = 'dhcp';
         i.address = utils_1.default.address();
         i.netmask = utils_1.default.netmask();
@@ -325,11 +430,20 @@ class Krill {
     /**
      * SUMMARY
      */
-    async summary(location, keyboard, partitions) {
+    async summary(location, keyboard, partitions, users, unattended = false) {
         let summaryElem;
+        let message = "";
+        if (unattended) {
+            message = "Unattended installation will start in 30 seconds, press CTRL-C to abort!";
+        }
         while (true) {
-            summaryElem = react_1.default.createElement(summary_1.default, { region: location.region, zone: location.zone, language: location.language, keyboardModel: keyboard.keyboardModel, keyboardLayout: keyboard.keyboardLayout, installationDevice: partitions.installationDevice });
-            if (await confirm(summaryElem, "Confirm Summary datas?")) {
+            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);
+                break;
+            }
+            else if (await confirm(summaryElem, "Confirm Summary datas?")) {
                 break;
             }
         }
@@ -337,9 +451,9 @@ class Krill {
     /**
      * INSTALL
      */
-    async install(location, keyboard, partitions, users, network, verbose = false) {
+    async install(location, keyboard, partitions, users, network, unattended = false, verbose = false) {
         const sequence = new krill_sequence_1.default(location, keyboard, partitions, users, network);
-        await sequence.install(verbose);
+        await sequence.install(unattended, verbose);
     }
     /**
      * return true if pv exist
@@ -394,3 +508,13 @@ function netmask2CIDR(mask) {
         .map(part => decimalToBinary(part))
         .join(''), '1');
 }
+/**
+ *
+ * @param ms
+ * @returns
+ */
+function sleep(ms = 0) {
+    return new Promise((resolve) => {
+        setTimeout(resolve, ms);
+    });
+}

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

@@ -45,7 +45,7 @@ import { IRemix, IDistro, INet } from '../interfaces';
 import Settings from '../classes/settings';
 import { IInstaller, IDevices } from '../interfaces';
 import { ILocation, IKeyboard, IPartitions, IUsers } from '../interfaces/i-krill';
-import partition from './modules/partitions';
+import partition from './modules/partition';
 import { mountFs, umountFs } from './modules/mount-fs';
 import { mountVfs, umountVfs } from './modules/mount-vfs';
 import unpackfs from './modules/unpackfs';
@@ -62,6 +62,7 @@ import bootloaderConfigArch from './modules/bootloader-config-arch';
 import bootloaderConfigUbuntu from './modules/bootloader-config-ubuntu';
 import grubcfg from './modules/grubcfg';
 import bootloader from './modules/bootloader';
+import packages from './modules/packages';
 import removeInstallerLink from './modules/remove-installer-link';
 import initramfsCfg from './modules/initramfs-cfg';
 import initramfs from './modules/initramfs';
@@ -92,6 +93,7 @@ export default class Sequence {
     bootloaderConfigUbuntu: typeof bootloaderConfigUbuntu;
     grubcfg: typeof grubcfg;
     bootloader: typeof bootloader;
+    packages: typeof packages;
     removeInstallerLink: typeof removeInstallerLink;
     initramfsCfg: typeof initramfsCfg;
     initramfs: typeof initramfs;
@@ -137,7 +139,7 @@ export default class Sequence {
      * @param umount
      * @returns
      */
-    install(verbose?: boolean): Promise<void>;
+    install(unattended?: boolean, verbose?: boolean): Promise<void>;
     /**
      *
      */
@@ -145,5 +147,5 @@ export default class Sequence {
     /**
      * only show the result
      */
-    finished(): Promise<void>;
+    finished(unattended?: boolean): Promise<void>;
 }