penguins-eggs 9.0.9 → 9.0.31

package/lib/classes/krill_prepare.d.ts

@@ -5,7 +5,7 @@ export default class Krill {
      *
      * @param cryped
      */
-    prepare(cryped?: boolean): Promise<void>;
+    prepare(cryped?: boolean, pve?: boolean, verbose?: boolean): Promise<void>;
     /**
      * WELCOME
      */
@@ -21,7 +21,7 @@ export default class Krill {
     /**
     * PARTITIONS
     */
-    partitions(crypted?: boolean): Promise<IPartitions>;
+    partitions(crypted?: boolean, pve?: boolean): Promise<IPartitions>;
     /**
      * USERS
      */
@@ -37,5 +37,9 @@ export default class Krill {
     /**
      * INSTALL
      */
-    install(location: ILocation, keyboard: IKeyboard, partitions: IPartitions, users: IUsers, network: INet): Promise<void>;
+    install(location: ILocation, keyboard: IKeyboard, partitions: IPartitions, users: IUsers, network: INet, verbose?: boolean): Promise<void>;
+    /**
+     * return true if pv exist
+     */
+    private pvExist;
 }

package/lib/classes/krill_prepare.js

@@ -6,6 +6,7 @@ const ink_1 = require("ink");
 const utils_1 = (0, tslib_1.__importDefault)(require("./utils"));
 const shelljs_1 = (0, tslib_1.__importDefault)(require("shelljs"));
 const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
+const systemctl_1 = (0, tslib_1.__importDefault)(require("./systemctl"));
 // libraries
 const exec = require('../lib/utils').exec;
 const welcome_1 = (0, tslib_1.__importDefault)(require("../components/welcome"));
@@ -40,21 +41,41 @@ class Krill {
      *
      * @param cryped
      */
-    async prepare(cryped = false) {
+    async prepare(cryped = false, pve = false, verbose = false) {
+        /**
+         * Check for disk presence
+         */
+        const drives = shelljs_1.default.exec('lsblk |grep disk|cut -f 1 "-d "', { silent: true }).stdout.trim().split('\n');
+        if (drives[0] === '') {
+            await utils_1.default.pressKeyToExit(`No disk to install the system in this machine.\nkrill installer refuses to continue`);
+        }
+        /**
+         * check for lvm2
+         */
+        if (await this.pvExist()) {
+            await utils_1.default.pressKeyToExit(`There is a lvm2 volume in the system, remove it manually before installation.\nkrill installer refuses to continue`);
+        }
+        /**
+        * stop udisks2.service
+        */
+        const systemdCtl = new systemctl_1.default(verbose);
+        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);
+        const oPartitions = await this.partitions(cryped, pve);
         const oUsers = await this.users();
         const oNetwork = await this.network();
         await this.summary(oLocation, oKeyboard, oPartitions);
-        await this.install(oLocation, oKeyboard, oPartitions, oUsers, oNetwork);
+        await this.install(oLocation, oKeyboard, oPartitions, oUsers, oNetwork, verbose);
     }
     /**
      * WELCOME
      */
     async welcome() {
-        let language = shelljs_1.default.exec('cat /etc/default/locale |grep LANG=| cut -f2 -d=|cut -f1 -d.', { silent: true }).stdout.trim();
+        let language = shelljs_1.default.exec(`grep LANG= < /etc/default/locale| cut -f2 -d=|cut -f1 -d.`, { silent: true }).stdout.trim();
         let welcomeElem;
         while (true) {
             welcomeElem = react_1.default.createElement(welcome_1.default, { language: language });
@@ -74,8 +95,8 @@ class Krill {
      * LOCATION
      */
     async location(language) {
-        let region = shelljs_1.default.exec('cat /etc/timezone |cut -f1 -d/', { silent: true }).stdout.trim();
-        let zone = shelljs_1.default.exec('cat /etc/timezone |cut -f2 -d/', { silent: true }).stdout.trim();
+        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 locationElem;
         while (true) {
             locationElem = react_1.default.createElement(location_1.default, { language: language, region: region, zone: zone });
@@ -103,13 +124,13 @@ class Krill {
     * KEYBOARD
     */
     async keyboard() {
-        let keyboardModel = shelljs_1.default.exec('cat /etc/default/keyboard |grep XKBMODEL|cut -f2 -d=|cut -f2 "-d\\""', { silent: true }).stdout.trim();
+        let keyboardModel = shelljs_1.default.exec('grep XKBMODEL < /etc/default/keyboard |cut -f2 -d= | cut -f2 "-d\\""', { silent: true }).stdout.trim();
         if (keyboardModel === '') {
             keyboardModel = "pc105";
         }
-        let keyboardLayout = shelljs_1.default.exec('cat /etc/default/keyboard |grep XKBLAYOUT|cut -f2 -d=|cut -f2 "-d\\""', { silent: true }).stdout.trim();
-        let keyboardVariant = shelljs_1.default.exec('/etc/default/keyboard |grep XKBVARIANT|cut -f2 -d=|cut -f2 "-d\\""', { silent: true }).stdout.trim();
-        let keyboardOptions = shelljs_1.default.exec('cat /etc/default/keyboard |grep XKBOPTIONS|cut -f2 -d=|cut -f2 "-d\\""', { silent: true }).stdout.trim();
+        let keyboardLayout = shelljs_1.default.exec('grep XKBLAYOUT < /etc/default/keyboard | cut -f2 -d= | cut -f2 "-d\\""', { silent: true }).stdout.trim();
+        let keyboardVariant = shelljs_1.default.exec('grep XKBVARIANT < /etc/default/keyboard | cut -f2 -d=|cut -f2 "-d\\""', { silent: true }).stdout.trim();
+        let keyboardOptions = shelljs_1.default.exec('grep XKBOPTIONS < /etc/default/keyboard | cut -f2 -d= | cut -f2 "-d\\""', { silent: true }).stdout.trim();
         let keyboardElem;
         while (true) {
             keyboardElem = react_1.default.createElement(keyboard_1.default, { keyboardModel: keyboardModel, keyboardLayout: keyboardLayout, keyboardVariant: keyboardVariant });
@@ -132,47 +153,56 @@ class Krill {
     /**
     * PARTITIONS
     */
-    async partitions(crypted = false) {
-        let installationDevice = '/dev/sda';
+    async partitions(crypted = false, pve = false) {
+        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);
+        });
+        let installationDevice = driveList[0]; // it was just /dev/sda before
         let installationMode = 'standard';
-        let luksPassphrase = 'evolution';
-        let filesystemType = 'ext4';
-        let userSwapChoice = 'small';
-        if (crypted = true) {
+        if (crypted) {
             installationMode = 'full-encrypted';
         }
+        else if (pve) {
+            installationMode = 'lvm2';
+        }
+        let filesystemType = 'ext4';
+        let userSwapChoice = 'small';
         let partitionsElem;
         while (true) {
-            partitionsElem = react_1.default.createElement(partitions_1.default, { installationDevice: installationDevice, installationMode: installationMode, luksPassphrase: luksPassphrase, filesystemType: filesystemType, userSwapChoice: userSwapChoice });
+            partitionsElem = react_1.default.createElement(partitions_1.default, { installationDevice: installationDevice, installationMode: installationMode, filesystemType: filesystemType, userSwapChoice: userSwapChoice });
             if (await confirm(partitionsElem, "Confirm Partitions datas?")) {
                 break;
             }
             else {
                 installationDevice = '';
-                if (crypted = true) {
+                installationMode = 'standard';
+                if (crypted) {
                     installationMode = 'full-encrypted';
                 }
-                luksPassphrase = 'evolution';
+                else if (pve) {
+                    installationMode = 'lvm2';
+                }
                 filesystemType = '';
                 userSwapChoice = '';
             }
-            partitionsElem = react_1.default.createElement(partitions_1.default, { installationDevice: installationDevice, installationMode: installationMode, luksPassphrase: luksPassphrase, filesystemType: filesystemType, userSwapChoice: userSwapChoice });
+            partitionsElem = react_1.default.createElement(partitions_1.default, { installationDevice: installationDevice, installationMode: installationMode, filesystemType: filesystemType, userSwapChoice: userSwapChoice });
             redraw(partitionsElem);
             installationDevice = await (0, select_installation_device_1.default)();
-            partitionsElem = react_1.default.createElement(partitions_1.default, { installationDevice: installationDevice, installationMode: installationMode, luksPassphrase: luksPassphrase, filesystemType: filesystemType, userSwapChoice: userSwapChoice });
+            partitionsElem = react_1.default.createElement(partitions_1.default, { installationDevice: installationDevice, installationMode: installationMode, filesystemType: filesystemType, userSwapChoice: userSwapChoice });
             redraw(partitionsElem);
             installationMode = await (0, select_installation_mode_1.default)();
-            partitionsElem = react_1.default.createElement(partitions_1.default, { installationDevice: installationDevice, installationMode: installationMode, luksPassphrase: luksPassphrase, filesystemType: filesystemType, userSwapChoice: userSwapChoice });
+            partitionsElem = react_1.default.createElement(partitions_1.default, { installationDevice: installationDevice, installationMode: installationMode, filesystemType: filesystemType, userSwapChoice: userSwapChoice });
             redraw(partitionsElem);
             filesystemType = await (0, select_filesystem_type_1.default)();
-            partitionsElem = react_1.default.createElement(partitions_1.default, { installationDevice: installationDevice, installationMode: installationMode, luksPassphrase: luksPassphrase, filesystemType: filesystemType, userSwapChoice: userSwapChoice });
+            partitionsElem = react_1.default.createElement(partitions_1.default, { installationDevice: installationDevice, installationMode: installationMode, filesystemType: filesystemType, userSwapChoice: userSwapChoice });
             redraw(partitionsElem);
             userSwapChoice = await (0, select_user_swap_choice_1.default)();
         }
         return {
             installationDevice: installationDevice,
             installationMode: installationMode,
-            luksPassphrase: luksPassphrase,
             filesystemType: filesystemType,
             userSwapChoice: userSwapChoice
         };
@@ -276,9 +306,20 @@ class Krill {
     /**
      * INSTALL
      */
-    async install(location, keyboard, partitions, users, network) {
+    async install(location, keyboard, partitions, users, network, verbose = false) {
         const hatching = new krill_install_1.default(location, keyboard, partitions, users, network);
-        hatching.install(true);
+        hatching.install(verbose);
+    }
+    /**
+     * return true if pv exist
+     */
+    async pvExist() {
+        let exist = false;
+        const check = `#!/bin/sh\npvdisplay |grep "PV Name" >/dev/null && echo 1|| echo 0`;
+        if (shelljs_1.default.exec(check).stdout.trim() === '1') {
+            exist = true;
+        }
+        return exist;
     }
 }
 exports.default = Krill;

package/lib/classes/ovary.d.ts

@@ -1,27 +1,25 @@
 import { IMyAddons } from '../interfaces';
 import Incubator from './incubation/incubator';
 import Settings from './settings';
+import Users from './users';
 /**
  * Ovary:
  */
 export default class Ovary {
+    verbose: boolean;
+    echo: {};
+    echoYes: {};
     toNull: string;
     incubator: Incubator;
     settings: Settings;
     familyId: string;
     snapshot_prefix: string;
     snapshot_basename: string;
-    theme: string;
     compression: string;
-    /**
-     * Egg
-     * @param compression
-     */
-    constructor(snapshot_prefix?: string, snapshot_basename?: string, theme?: string, compression?: string);
     /**
      * @returns {boolean} success
      */
-    fertilization(): Promise<boolean>;
+    fertilization(snapshot_prefix?: string, snapshot_basename?: string, theme?: string, compression?: string): Promise<boolean>;
     /**
      *
      * @param basename
@@ -30,7 +28,12 @@ export default class Ovary {
     /**
      * Crea la struttura della workdir
      */
-    liveCreateStructure(verbose?: boolean): Promise<void>;
+    liveCreateStructure(): Promise<void>;
+    /**
+     *
+     * @param cmd
+     */
+    tryCatch(cmd?: string): Promise<void>;
     /**
      * editLiveFs
      * - Truncate logs, remove archived log
@@ -41,33 +44,32 @@ export default class Ovary {
      * - Add some basic files to /dev
      * - Clear configs from /etc/network/interfaces, wicd and NetworkManager and netman
      */
-    editLiveFs(verbose?: boolean): Promise<void>;
+    editLiveFs(): Promise<void>;
     /**
      * syslinux
      */
-    syslinux(verbose?: boolean): Promise<void>;
+    syslinux(): Promise<void>;
     /**
      *  async isolinux
      */
-    isolinux(theme?: string, verbose?: boolean): Promise<void>;
+    isolinux(theme?: string): Promise<void>;
     /**
      * copy kernel
      */
-    kernelCopy(verbose?: boolean): Promise<void>;
+    kernelCopy(): Promise<void>;
     /**
-     * necessita di verbose
+     * necessita di echoYes
      */
-    initrdCreate(verbose?: boolean): Promise<void>;
+    initrdCreate(): Promise<void>;
     /**
-     *
-     * @param verbose
+     * We must upgrade to initrdCreate for Debian/Ubuntu
      * @returns
      */
     initrdCopy(verbose?: boolean): Promise<void>;
     /**
      * squashFs: crea in live filesystem.squashfs
      */
-    makeSquashfs(scriptOnly?: boolean, verbose?: boolean): Promise<void>;
+    makeSquashfs(scriptOnly?: boolean): Promise<void>;
     /**
      * Restituisce true per le direcory da montare con overlay
      *
@@ -88,10 +90,6 @@ export default class Ovary {
      * - normal solo la creazione della directory, nessun mount
      * - merged creazione della directory e mount ro
      * - mergedAndOverlay creazione directory, overlay e mount rw
-     *
-     * @param dir
-     *
-     * @returns merged
      */
     merged(dir: string): boolean;
     /**
@@ -100,46 +98,36 @@ export default class Ovary {
      *
      * @param verbose
      */
-    bindLiveFs(verbose?: boolean): Promise<void>;
+    bindLiveFs(): Promise<void>;
     /**
      * ubind del fs live
      * @param verbose
      */
-    uBindLiveFs(verbose?: boolean): Promise<void>;
+    uBindLiveFs(): Promise<void>;
     /**
      * bind dei virtual file system
      */
-    bindVfs(verbose?: boolean): Promise<void>;
+    bindVfs(): Promise<void>;
     /**
      *
      * @param verbose
      */
-    ubindVfs(verbose?: boolean): Promise<void>;
+    ubindVfs(): Promise<void>;
     /**
      *
      * @param verbose
      */
-    getUsersDatasSize(verbose?: boolean): Promise<number>;
-    /**
-     *
-     * @param verbose
-     */
-    copyUsersDatas(verbose?: boolean): Promise<void>;
-    /**
-     *
-     * @param verbose
-     */
-    cleanUsersAccounts(verbose?: boolean): Promise<void>;
+    cleanUsersAccounts(): Promise<void>;
     /**
      * list degli utenti: grep -E 1[0-9]{3}  /etc/passwd | sed s/:/\ / | awk '{print $1}'
      * create la home per user_opt
      * @param verbose
      */
-    createUserLive(verbose?: boolean): Promise<void>;
+    createUserLive(): Promise<void>;
     /**
      *
      */
-    createXdgAutostart(theme: string | undefined, myAddons: IMyAddons, verbose?: boolean): Promise<void>;
+    createXdgAutostart(theme: string | undefined, myAddons: IMyAddons): Promise<void>;
     /**
      * Creazione link desktop per lxde
      * @param name
@@ -155,13 +143,13 @@ export default class Ovary {
     /**
      * makeEfi
     */
-    makeEfi(theme?: string, verbose?: boolean): Promise<void>;
+    makeEfi(theme?: string): Promise<void>;
     /**
      * makeDotDisk
      * create .disk/info, .disk/mksquashfs, .disk/mkiso
      * return mkiso
      */
-    makeDotDisk(backup?: boolean, verbose?: boolean): string;
+    makeDotDisk(backup?: boolean): string;
     /**
      *
      * @param backup
@@ -172,10 +160,14 @@ export default class Ovary {
      * makeIso
      * cmd: cmd 4 xorirriso
      */
-    makeIso(cmd: string, scriptOnly?: boolean, verbose?: boolean): Promise<void>;
+    makeIso(cmd: string, scriptOnly?: boolean): Promise<void>;
     /**
      * finished = show the results
      * @param scriptOnly
      */
     finished(scriptOnly?: boolean): void;
+    /**
+    * fill
+    */
+    usersFill(): Promise<Users[]>;
 }