penguins-eggs 9.3.23 → 9.3.25

package/dist/commands/produce.js

@@ -58,18 +58,15 @@ class Produce extends core_1.Command {
             }
             const compressors = new compressors_1.default();
             await compressors.populate();
-            let compression = compressors.normal();
+            let compression = compressors.fast();
             if (flags.max) {
                 compression = compressors.max();
             }
-            else if (flags.fast) {
-                compression = compressors.fast();
+            else if (flags.standard) {
+                compression = compressors.normal();
             }
             const release = flags.release;
-            // if (release) {
-            // compression = compressors.max()
-            // }
-            const backup = flags.backup;
+            const cryptedclone = flags.cryptedclone;
             const clone = flags.clone;
             const verbose = flags.verbose;
             const scriptOnly = flags.script;
@@ -91,7 +88,7 @@ class Produce extends core_1.Command {
                     }
                 }
             }
-            const i = await config_1.default.thatWeNeed(nointeractive, verbose, backup);
+            const i = await config_1.default.thatWeNeed(nointeractive, verbose, cryptedclone);
             if ((i.needApt || i.configurationInstall || i.configurationRefresh || i.distroTemplate) && (await utils_1.default.customConfirm('Select yes to continue...'))) {
                 await config_1.default.install(i, verbose);
             }
@@ -114,7 +111,7 @@ class Produce extends core_1.Command {
             const ovary = new ovary_1.default();
             utils_1.default.warning('Produce an egg...');
             if (await ovary.fertilization(prefix, basename, theme, compression, !nointeractive)) {
-                await ovary.produce(backup, clone, scriptOnly, yolkRenew, release, myAddons, nointeractive, verbose);
+                await ovary.produce(clone, cryptedclone, scriptOnly, yolkRenew, release, myAddons, nointeractive, verbose);
                 ovary.finished(scriptOnly);
             }
         }
@@ -126,16 +123,16 @@ class Produce extends core_1.Command {
 exports.default = Produce;
 Produce.flags = {
     addons: core_1.Flags.string({ multiple: true, description: 'addons to be used: adapt, ichoice, pve, rsupport' }),
-    backup: core_1.Flags.boolean({ char: 'b', description: 'backup mode (CRYPTED)' }),
     basename: core_1.Flags.string({ description: 'basename' }),
-    clone: core_1.Flags.boolean({ char: 'c', description: 'clone mode' }),
-    fast: core_1.Flags.boolean({ char: 'f', description: 'fast compression' }),
+    clone: core_1.Flags.boolean({ char: 'c', description: 'clone' }),
+    cryptedclone: core_1.Flags.boolean({ char: 'C', description: 'crypted clone' }),
     help: core_1.Flags.help({ char: 'h' }),
     max: core_1.Flags.boolean({ char: 'm', description: 'max compression' }),
     nointeractive: core_1.Flags.boolean({ char: 'n', description: 'don\'t ask for user interctions' }),
     prefix: core_1.Flags.string({ char: 'p', description: 'prefix' }),
     release: core_1.Flags.boolean({ description: 'release: max compression, remove penguins-eggs and calamares after installation' }),
     script: core_1.Flags.boolean({ char: 's', description: 'script mode. Generate scripts to manage iso build' }),
+    standard: core_1.Flags.boolean({ char: 'f', description: 'standard compression' }),
     theme: core_1.Flags.string({ description: 'theme for livecd, calamares branding and partitions' }),
     verbose: core_1.Flags.boolean({ char: 'v', description: 'verbose' }),
     yolk: core_1.Flags.boolean({ char: 'y', description: '-y force yolk renew' }),
@@ -143,10 +140,11 @@ Produce.flags = {
 Produce.description = 'produce a live image from your system whithout your data';
 Produce.examples = [
     "sudo eggs produce",
-    "sudo eggs produce --fast",
+    "sudo eggs produce --standard",
     "sudo eggs produce --max",
-    "sudo eggs produce --fast --basename=colibri",
-    "sudo eggs produce --fast --basename=colibri --theme /path/to/theme --addons adapt",
-    "sudo eggs produce --fast --clone",
-    "sudo eggs produce --fast --backup",
+    "sudo eggs produce --max --basename=colibri",
+    "sudo eggs produce --cryptedclone",
+    "sudo eggs produce --clone",
+    "sudo eggs produce --basename=colibri",
+    "sudo eggs produce --basename=colibri --theme /path/to/theme --addons adapt",
 ];

package/dist/commands/syncfrom.js

@@ -21,10 +21,10 @@ class Syncfrom extends core_1.Command {
         this.verbose = false;
         this.echo = {};
         this.rootDir = '/';
-        this.luksName = 'luks-eggs-backup';
+        this.luksName = 'luks-eggs-data';
         this.luksFile = `/run/live/medium/live/${this.luksName}`;
         this.luksDevice = `/dev/mapper/${this.luksName}`;
-        this.luksMountpoint = '/tmp/eggs-backup';
+        this.luksMountpoint = '/tmp/eggs-data';
     }
     async run() {
         const { flags } = await this.parse(Syncfrom);
@@ -50,7 +50,7 @@ class Syncfrom extends core_1.Command {
         }
         if (utils_1.default.isRoot()) {
             if (fileVolume === '') {
-                fileVolume = '/run/live/medium/live/luks-eggs-backup';
+                fileVolume = '/run/live/medium/live/luks-eggs-dada';
             }
             if (!utils_1.default.isLive()) {
                 /**
@@ -60,7 +60,7 @@ class Syncfrom extends core_1.Command {
                     this.luksName = path_1.default.basename(fileVolume);
                     this.luksFile = fileVolume;
                     this.luksDevice = `/dev/mapper/${this.luksName}`;
-                    this.luksMountpoint = '/tmp/eggs-backup';
+                    this.luksMountpoint = '/tmp/eggs-data';
                     await this.restorePrivateData();
                     if (await utils_1.default.customConfirm(`Your system was updated! Press a key to reboot`)) {
                         await (0, utils_2.exec)('reboot');
@@ -77,7 +77,7 @@ class Syncfrom extends core_1.Command {
                 this.luksName = path_1.default.basename(fileVolume);
                 this.luksFile = fileVolume;
                 this.luksDevice = `/dev/mapper/${this.luksName}`;
-                this.luksMountpoint = '/tmp/eggs-backup';
+                this.luksMountpoint = '/tmp/eggs-data';
                 await this.restorePrivateData();
             }
         }
@@ -108,7 +108,7 @@ class Syncfrom extends core_1.Command {
                 await (0, utils_2.exec)(`cp ${this.luksMountpoint}/etc/group ${this.rootDir}/etc/`, this.echo);
             }
         }
-        utils_1.default.warning('Restoring backup data');
+        utils_1.default.warning('Restoring crypted data');
         let cmd = `rsync -a ${this.luksMountpoint}/ROOT/ ${this.rootDir}/`;
         if (destDelete) {
             cmd = `rsync --archive --delete ${this.luksMountpoint}/ROOT/ ${this.rootDir}/`;
@@ -161,6 +161,6 @@ Syncfrom.flags = {
 };
 Syncfrom.description = 'restore users and user data from a LUKS volumes';
 Syncfrom.examples = [
-    'sudo eggs restore',
-    'sudo eggs restore --file /path/to/fileLUKS',
+    'sudo eggs syncfrom',
+    'sudo eggs syncfrom --file /path/to/fileLUKS',
 ];

package/dist/commands/syncto.js

@@ -67,12 +67,12 @@ class Syncto extends core_1.Command {
              * restore con file
              */
             if (fileVolume === '') {
-                fileVolume = '/tmp/luks-eggs-backup';
+                fileVolume = '/tmp/luks-eggs-data';
             }
             this.luksName = path_1.default.basename(fileVolume);
             this.luksFile = fileVolume;
             this.luksDevice = `/dev/mapper/${this.luksName}`;
-            this.luksMountpoint = '/tmp/eggs-backup';
+            this.luksMountpoint = '/tmp/eggs-data';
             if (!fs_1.default.existsSync(fileVolume)) {
                 await this.luksCreate();
             }

package/dist/krill/krill-sequence.js

@@ -124,11 +124,14 @@ class Sequence {
         this.settings = {};
         this.remix = {};
         this.distro = {};
-        this.luksName = '';
-        this.luksFile = '';
-        this.luksDevice = '';
-        this.luksMountpoint = '';
-        this.personalFile = '';
+        // Crypted Clone
+        this.luksName = 'luks-eggs-data';
+        this.luksFile = `/run/live/medium/live/${this.luksName}`;
+        this.luksDevice = `/dev/mapper/${this.luksName}`;
+        this.luksMountpoint = `/mnt`;
+        // Clone (Uncrypted)
+        this.is_clone = fs_1.default.existsSync('/etc/penguins-eggs.d/is_clone');
+        this.is_crypted_clone = fs_1.default.existsSync('/etc/penguins-eggs.d/is_crypted_clone');
         this.unattended = false;
         this.installer = (0, installer_1.installer)();
         this.settings = new settings_1.default();
@@ -148,13 +151,6 @@ class Sequence {
         this.devices.swap = {};
         this.distro = new distro_1.default(this.remix);
         this.efi = fs_1.default.existsSync('/sys/firmware/efi/efivars');
-        // Per il restore dei dati
-        this.luksName = 'luks-eggs-backup';
-        this.luksFile = `/run/live/medium/live/${this.luksName}`;
-        this.luksDevice = `/dev/mapper/${this.luksName}`;
-        this.luksMountpoint = `/mnt`;
-        // per il restore dei dati personali controllo esistenza di is-clone.md
-        this.personalFile = `/run/live/medium/live/is-clone.md`;
     }
     /**
      * install
@@ -176,7 +172,7 @@ class Sequence {
         let message = "";
         let isPartitioned = false;
         message = "Creating partitions";
-        percent = 0.01;
+        percent = 0.03;
         try {
             await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
             isPartitioned = await this.partition();
@@ -187,7 +183,7 @@ class Sequence {
         if (isPartitioned) {
             // formatting
             message = "Formatting file system ";
-            percent = 0.02;
+            percent = 0.06;
             try {
                 await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 await this.mkfs();
@@ -197,7 +193,7 @@ class Sequence {
             }
             // mountFs
             message = "Mounting target file system ";
-            percent = 0.03;
+            percent = 0.09;
             try {
                 redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 await this.mountFs();
@@ -207,7 +203,7 @@ class Sequence {
             }
             // mountVfs
             message = "Mounting on target VFS ";
-            percent = 0.06;
+            percent = 0.12;
             try {
                 await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 await this.mountVfs();
@@ -217,7 +213,7 @@ class Sequence {
             }
             // unpackfs
             message = "Unpacking filesystem ";
-            percent = 0.10;
+            percent = 0.15;
             try {
                 await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 await this.unpackfs();
@@ -228,7 +224,7 @@ class Sequence {
             // dpkg-unsafe-io
             if (this.distro.familyId === 'debian') {
                 message = "dpkg-unsafe-io";
-                percent = 0.11;
+                percent = 0.40;
                 try {
                     await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                     await this.execCalamaresModule('dpkg-unsafe-io');
@@ -237,26 +233,10 @@ class Sequence {
                     await utils_1.default.pressKeyToExit(JSON.stringify(error));
                 }
             }
-            /**
-             * IF RESTORE USERS DATA
-             */
-            if (fs_1.default.existsSync(this.luksFile)) {
-                // restoring users data
-                message = "Restore private data from backup ";
-                percent = 0.37;
-                let cmd = 'eggs syncfrom --rootdir /tmp/calamares-krill-root/';
-                try {
-                    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) {
-                    await utils_1.default.pressKeyToExit(cmd);
-                }
-            }
             // sources-yolk
             if (this.distro.familyId === 'debian') {
                 message = 'sources-yolk';
-                percent = 0.40;
+                percent = 0.43;
                 try {
                     await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent, spinner: true }));
                     await this.execCalamaresModule('sources-yolk');
@@ -267,7 +247,7 @@ class Sequence {
             }
             // machineid
             message = 'machineid';
-            percent = 0.41;
+            percent = 0.46;
             try {
                 await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent, spinner: true }));
                 await this.machineId();
@@ -277,7 +257,7 @@ class Sequence {
             }
             // fstab
             message = "Creating fstab ";
-            percent = 0.47;
+            percent = 0.49;
             try {
                 await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 await this.fstab(this.partitions.installationDevice);
@@ -285,46 +265,39 @@ class Sequence {
             catch (error) {
                 await utils_1.default.pressKeyToExit(JSON.stringify(error));
             }
-            // locale
-            message = "Locale ";
-            percent = 0.47;
-            try {
-                redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
-                await this.locale();
-            }
-            catch (error) {
-                await utils_1.default.pressKeyToExit(JSON.stringify(error));
-            }
-            // keyboard
-            message = "settings keyboard ";
-            percent = 0.48;
-            try {
-                this.keyboard();
-            }
-            catch (error) {
-                await utils_1.default.pressKeyToExit(JSON.stringify(error));
-            }
-            // localeCfg
-            message = "localeCfg";
-            percent = 0.50;
-            try {
-                this.localeCfg();
-            }
-            catch (error) {
-                await utils_1.default.pressKeyToExit(JSON.stringify(error));
+            /**
+             * CryptedClone exec eggs syncfrom
+             */
+            if (this.is_crypted_clone) {
+                message = "Restore private data from crypted clone ";
+                if (fs_1.default.existsSync(this.luksFile)) {
+                    percent = 0.55;
+                    let cmd = `eggs syncfrom --rootdir /tmp/calamares-krill-root/ --file ${this.luksFile}`;
+                    try {
+                        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));
+                        this.is_clone = true; // Adesso è un clone
+                    }
+                    catch (error) {
+                        await utils_1.default.pressKeyToExit(cmd);
+                    }
+                }
+                else {
+                    await utils_1.default.pressKeyToExit(`Cannot find LUKS file ${this.luksFile}`);
+                }
             }
             // networkcfg
             message = "networkcfg";
-            percent = 0.50;
+            percent = 0.61;
             try {
-                this.networkCfg();
+                await this.networkCfg();
             }
             catch (error) {
                 await utils_1.default.pressKeyToExit(JSON.stringify(error));
             }
             // hostname
             message = "Create hostname ";
-            percent = 0.53;
+            percent = 0.64;
             try {
                 await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 await this.hostname(domain);
@@ -334,17 +307,17 @@ class Sequence {
             }
             // initramfsCfg
             message = "initramfs configure";
-            percent = 0.55;
+            percent = 0.67;
             try {
                 await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
-                this.initramfsCfg(this.partitions.installationDevice);
+                await this.initramfsCfg(this.partitions.installationDevice);
             }
             catch (error) {
                 await utils_1.default.pressKeyToExit(JSON.stringify(error));
             }
             // initramfs
             message = "initramfs ";
-            percent = 0.60;
+            percent = 0.70;
             try {
                 await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 await this.initramfs();
@@ -355,7 +328,7 @@ class Sequence {
             // dpkg-unsafe-io-undo
             if (this.distro.familyId === 'debian') {
                 message = "dpkg-unsafe-io-undo";
-                percent = 0.61;
+                percent = 0.72;
                 try {
                     await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                     await this.execCalamaresModule('dpkg-unsafe-io-undo');
@@ -365,72 +338,102 @@ class Sequence {
                 }
             }
             /**
-             * IF NOT RESTORE USERS DATA OR PERSONAL BACKUP
+             * IF NOT CLONE:
+             * - locale
+             * - keyboard
+             * - localeCfg
+             * - delLiveUser
+             * - adduser
+             * - autologin
              */
-            if (!fs_1.default.existsSync(this.luksFile) || fs_1.default.existsSync(this.personalFile)) {
-                // delLiveUser
-                message = "Removing user live ";
-                percent = 0.61;
+            if (!this.is_clone) {
+                // locale
+                message = "Locale";
+                percent = 0.74;
                 try {
-                    await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
-                    await this.delLiveUser();
+                    redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                    await this.locale();
                 }
                 catch (error) {
                     await utils_1.default.pressKeyToExit(JSON.stringify(error));
                 }
-                // addUser
-                message = "Adding user ";
-                percent = 0.62;
+                // keyboard
+                message = "settings keyboard";
+                percent = 0.75;
                 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, '', '', '');
+                    await this.keyboard();
                 }
                 catch (error) {
                     await utils_1.default.pressKeyToExit(JSON.stringify(error));
                 }
-                // changePassword root
-                message = "adding user password ";
-                percent = 0.63;
+                // localeCfg
+                message = "Locale Configuration";
+                percent = 0.76;
+                try {
+                    await this.localeCfg();
+                    await (0, utils_2.exec)("chroot " + this.installTarget + " locale-gen");
+                }
+                catch (error) {
+                    await utils_1.default.pressKeyToExit(JSON.stringify(error));
+                }
+                // delLiveUser
+                message = "Remove user LIVE";
+                percent = 0.75;
                 try {
                     await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
-                    await this.changePassword('root', this.users.rootPassword);
+                    await this.delLiveUser();
                 }
                 catch (error) {
                     await utils_1.default.pressKeyToExit(JSON.stringify(error));
                 }
-            }
-            // autologin
-            if (pacman_1.default.isInstalledGui()) {
+                // addUser
+                message = "Add user";
+                percent = 0.76;
                 try {
-                    message = "autologin GUI";
-                    percent = 0.65;
-                    if (this.users.autologin) {
-                        await xdg_1.default.autologin(await utils_1.default.getPrimaryUser(), this.users.name, this.installTarget);
-                    }
                     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) {
                     await utils_1.default.pressKeyToExit(JSON.stringify(error));
                 }
-            }
-            else { // autologin CLI remove DEFAULT
-                message = "autologin CLI";
-                percent = 0.66;
+                // changePassword root
+                message = "Add user password";
+                percent = 0.77;
                 try {
                     await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
-                    await cliAutologin.remove(this.installTarget);
+                    await this.changePassword('root', this.users.rootPassword);
                 }
                 catch (error) {
                     await utils_1.default.pressKeyToExit(JSON.stringify(error));
                 }
+                // autologin
+                if (pacman_1.default.isInstalledGui()) {
+                    try {
+                        message = "Autologin GUI";
+                        percent = 0.78;
+                        if (this.users.autologin) {
+                            await xdg_1.default.autologin(await utils_1.default.getPrimaryUser(), this.users.name, this.installTarget);
+                        }
+                        await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                    }
+                    catch (error) {
+                        await utils_1.default.pressKeyToExit(JSON.stringify(error));
+                    }
+                }
+            } // IF NOT CLONE END
+            // Remove autologin CLI
+            message = "Remove autologin CLI";
+            percent = 0.80;
+            try {
+                await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                await cliAutologin.remove(this.installTarget);
+            }
+            catch (error) {
+                await utils_1.default.pressKeyToExit(JSON.stringify(error));
             }
-            // cleanup
-            await cliAutologin.msgRemove(`${this.installTarget}/etc/motd`);
-            await cliAutologin.msgRemove(`${this.installTarget}/etc/issue`);
-            await cliAutologin.remove(this.installTarget);
             // bootloader-config
             message = "bootloader-config ";
-            percent = 0.70;
+            percent = 0.82;
             try {
                 await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 await this.bootloaderConfig();
@@ -440,7 +443,7 @@ class Sequence {
             }
             // grubcfg
             message = "grubcfg ";
-            percent = 0.75;
+            percent = 0.84;
             try {
                 await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 await this.grubcfg();
@@ -450,7 +453,7 @@ class Sequence {
             }
             // bootloader (grub-install)
             message = "bootloader ";
-            percent = 0.80;
+            percent = 0.86;
             try {
                 await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 await this.bootloader();
@@ -461,7 +464,7 @@ class Sequence {
             // sources-yolk-undo
             if (this.distro.familyId === 'debian') {
                 message = "sources-yolk-undo";
-                percent = 0.90;
+                percent = 0.88;
                 try {
                     await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                     await this.execCalamaresModule('sources-yolk-undo');
@@ -472,14 +475,13 @@ class Sequence {
             }
             // packages
             message = "add/remove packages";
-            percent = 0.91;
+            percent = 0.90;
             try {
                 await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 await this.packages();
             }
             catch (error) {
                 console.log(JSON.stringify(error));
-                // await Utils.pressKeyToExit(JSON.stringify(error))
             }
             /**
              *
@@ -487,7 +489,7 @@ class Sequence {
              */
             if (await pacman_1.default.calamaresCheck()) {
                 message = "remove installer link";
-                percent = 0.93;
+                percent = 0.92;
                 try {
                     await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                     await this.removeInstallerLink();
@@ -496,9 +498,20 @@ class Sequence {
                     await utils_1.default.pressKeyToExit(JSON.stringify(error));
                 }
             }
+            // remove /etc/penguins_eggs.d/is_clone*
+            message = "Cleanup";
+            percent = 0.94;
+            try {
+                await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                await (0, utils_2.exec)(`rm -f ${this.installTarget}/etc/penguins-eggs.d/is_clone`);
+                await (0, utils_2.exec)(`rm -f ${this.installTarget}/etc/penguins-eggs.d/is_crypted_clone`);
+            }
+            catch (error) {
+                await utils_1.default.pressKeyToExit(JSON.stringify(error));
+            }
             // umountVfs
             message = "umount VFS";
-            percent = 0.95;
+            percent = 0.96;
             try {
                 await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 await this.umountVfs();
@@ -508,7 +521,7 @@ class Sequence {
             }
             // umount
             message = "umount";
-            percent = 0.97;
+            percent = 0.98;
             try {
                 await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 await this.umountFs();

package/dist/krill/modules/locale-cfg.js

@@ -47,10 +47,11 @@ async function localeCfg() {
     }
     localeGenDest += '\n';
     localeGenDest += krillBookmark;
-    const locales = [this.language];
+    const locales = [];
     if (this.language !== 'en_US.UTF-8') {
         locales.push('en_US.UTF-8');
     }
+    locales.push(this.language);
     for (const supported of supporteds) {
         for (const locale of locales) {
             if (supported.includes(locale)) {

package/dist/krill/modules/locale.js

@@ -19,7 +19,7 @@ async function locale() {
      *             - /etc/locale.conf
      *             - /etc/timezone
      */
-    let defaultLocale = 'en_US.UTF-8';
+    let defaultLocale = this.language;
     // /etc/default/locale
     let file = this.installTarget + '/etc/default/locale';
     let content = ``;

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

@@ -47,7 +47,7 @@ async function mKeyboard() {
     if (utils_1.default.isSystemd()) {
         let content = '# KEYBOARD CONFIGURATION FILE\n\n';
         content += '# Consult the keyboard(5) manual page.\n\n';
-        content += '# See penguins-eggs/src/krill/modules/set-keyboard.ts\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';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "penguins-eggs",
   "description": "Perri's Brewery edition: remaster your system and distribuite it",
-  "version": "9.3.23",
+  "version": "9.3.25",
   "author": "Piero Proietti @pieroproietti",
   "bin": {
     "eggs": "bin/run"