penguins-eggs 25.12.7 → 25.12.16

package/dist/krill/classes/sequence.d/remove-homecrypt-hack.js

@@ -0,0 +1,65 @@
+/**
+ * ./src/krill/modules/remove-installer-link.ts
+ * penguins-eggs v.25.7.x / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
+ */
+import fs from 'node:fs';
+import path from 'path';
+/**
+ * removeHomecryptHack
+ */
+export default async function removeHomecryptHack() {
+    const targetRoot = this.installTarget;
+    // -------------------------------------------------------
+    // 1. PULIZIA SYSVINIT (Critica per il boot)
+    // -------------------------------------------------------
+    const inittabPath = path.join(targetRoot, 'etc/inittab');
+    if (fs.existsSync(inittabPath)) {
+        let content = fs.readFileSync(inittabPath, 'utf8');
+        // Cerca la riga modificata dal nostro hack
+        const hackRegex = /^1:.*tty1-unlock-wrapper\.sh.*$/m;
+        // Ripristina la riga standard (adatta questa stringa se usi parametri diversi per agetty)
+        const standardLine = '1:2345:respawn:/sbin/agetty --noclear tty1 linux';
+        if (hackRegex.test(content)) {
+            content = content.replace(hackRegex, standardLine);
+            fs.writeFileSync(inittabPath, content);
+            // console.log('- Restored standard inittab entry')
+        }
+    }
+    // -------------------------------------------------------
+    // 2. PULIZIA SYSTEMD (Cosmetica / Best Practice)
+    // -------------------------------------------------------
+    // Anche se non rompe il boot, rimuoviamo i file inutili
+    const systemdFiles = [
+        'etc/systemd/system/mount-encrypted-home.service',
+        'etc/systemd/system/local-fs.target.wants/mount-encrypted-home.service'
+    ];
+    systemdFiles.forEach(fileRelPath => {
+        const fullPath = path.join(targetRoot, fileRelPath);
+        if (fs.existsSync(fullPath)) {
+            try {
+                fs.unlinkSync(fullPath);
+            }
+            catch (e) { /* ignore */ }
+        }
+    });
+    // -------------------------------------------------------
+    // 3. RIMOZIONE SCRIPT COMUNI
+    // -------------------------------------------------------
+    const scriptFiles = [
+        'usr/local/bin/tty1-unlock-wrapper.sh',
+        'usr/local/bin/mount-encrypted-home.sh'
+    ];
+    scriptFiles.forEach(fileRelPath => {
+        const fullPath = path.join(targetRoot, fileRelPath);
+        if (fs.existsSync(fullPath)) {
+            try {
+                fs.unlinkSync(fullPath);
+            }
+            catch (e) { /* ignore */ }
+        }
+    });
+}

package/dist/krill/classes/sequence.d/unpackfs.js

@@ -17,8 +17,8 @@ export default async function unpackfs() {
     const cmd = `unsquashfs -d ${this.installTarget} -f ${squafsPath} ${this.toNull}`;
     // Usiamo echo false per evitare di intasare il log con migliaia di file
     const echoNo = Utils.setEcho(false);
-    console.log('Unpacking filesystem (this may take a while)...');
+    // console.log('Unpacking filesystem (this may take a while)...')
     // Esecuzione
     await exec(cmd, echoNo);
-    console.log('Filesystem unpacked successfully.');
+    // console.log('Filesystem unpacked successfully.')
 }

package/dist/krill/classes/sequence.d.ts

@@ -32,6 +32,7 @@ import grubcfg from './sequence.d/grubcfg.js';
 import bootloader from './sequence.d/bootloader.js';
 import packages from './sequence.d/packages.js';
 import removeInstallerLink from './sequence.d/remove_installer_link.js';
+import removeHomecryptHack from './sequence.d/remove-homecrypt-hack.js';
 import initramfsCfg from './sequence.d/initramfs_cfg.js';
 import initramfs from './sequence.d/initramfs.js';
 import delLiveUser from './sequence.d/del_live_user.js';
@@ -63,6 +64,7 @@ export default class Sequence {
     bootloader: typeof bootloader;
     packages: typeof packages;
     removeInstallerLink: typeof removeInstallerLink;
+    removeHomecryptHack: typeof removeHomecryptHack;
     initramfsCfg: typeof initramfsCfg;
     initramfs: typeof initramfs;
     delLiveUser: typeof delLiveUser;
@@ -92,13 +94,9 @@ export default class Sequence {
     settings: Settings;
     remix: IRemix;
     distro: IDistro;
-    luksMappedName: string;
-    luksFile: string;
-    luksDevice: string;
-    luksMountpoint: string;
     luksRootName: string;
+    cryptedHomeDevice: string;
     is_clone: boolean;
-    is_crypted_clone: boolean;
     unattended: boolean;
     nointeractive: boolean;
     chroot: boolean;

package/dist/krill/classes/sequence.js

@@ -6,6 +6,8 @@
  * email: piero.proietti@gmail.com
  * license: MIT
  */
+import path from 'path';
+const __dirname = path.dirname(new URL(import.meta.url).pathname);
 import Settings from '../../classes/settings.js';
 import React from 'react';
 import { render, Box, Text } from 'ink';
@@ -42,6 +44,7 @@ import grubcfg from './sequence.d/grubcfg.js';
 import bootloader from './sequence.d/bootloader.js';
 import packages from './sequence.d/packages.js';
 import removeInstallerLink from './sequence.d/remove_installer_link.js';
+import removeHomecryptHack from './sequence.d/remove-homecrypt-hack.js';
 import initramfsCfg from './sequence.d/initramfs_cfg.js';
 import initramfs from './sequence.d/initramfs.js';
 import delLiveUser from './sequence.d/del_live_user.js';
@@ -77,6 +80,7 @@ export default class Sequence {
     bootloader = bootloader;
     packages = packages;
     removeInstallerLink = removeInstallerLink;
+    removeHomecryptHack = removeHomecryptHack;
     initramfsCfg = initramfsCfg;
     initramfs = initramfs;
     delLiveUser = delLiveUser;
@@ -107,13 +111,13 @@ export default class Sequence {
     settings = {};
     remix = {};
     distro = {};
-    luksMappedName = 'luks-volume'; // encrypted ISOs
-    luksFile = ``; // encrypted ISOs
-    luksDevice = `/dev/mapper/${this.luksMappedName}`; // encrypted ISOs
-    luksMountpoint = `/mnt`; // encrypted ISOs
-    luksRootName = ''; // installation encrypted
+    // luksMappedName = 'luks-volume'                    // encrypted ISOs
+    // luksFile = ``                                     // encrypted ISOs
+    // luksDevice = `/dev/mapper/${this.luksMappedName}` // encrypted ISOs
+    // luksMountpoint = `/mnt`
+    luksRootName = '';
+    cryptedHomeDevice = '/dev/mapper/live-home';
     is_clone = fs.existsSync('/etc/penguins-eggs.d/is_clone');
-    is_crypted_clone = fs.existsSync('/etc/penguins-eggs.d/is_crypted_clone');
     unattended = false;
     nointeractive = false;
     chroot = false;
@@ -141,7 +145,7 @@ export default class Sequence {
         this.devices.swap = {};
         this.distro = new Distro();
         this.efi = fs.existsSync('/sys/firmware/efi/efivars');
-        this.luksFile = `${this.distro.liveMediumPath}live/${this.luksMappedName}`;
+        // this.luksFile = `${this.distro.liveMediumPath}live/${this.luksMappedName}`
         this.luksRootName = `${this.distro.distroLike}_root`;
         this.luksRootName = this.luksRootName.toLowerCase(); // installation encrypted
     }
@@ -233,19 +237,6 @@ export default class Sequence {
         // 5. Core system configuration
         await this.executeStep("machineid", 46, () => this.machineId());
         await this.executeStep("Creating fstab", 49, () => this.fstab(this.partitions.installationDevice));
-        // 6. Crypted clone restoration
-        if (this.is_crypted_clone) {
-            await this.executeStep("Restore private data from crypted clone", 55, async () => {
-                if (fs.existsSync(this.luksFile)) {
-                    const cmd = `eggs syncfrom --rootdir /tmp/calamares-krill-root/ --file ${this.luksFile}`;
-                    await exec(cmd, Utils.setEcho(true));
-                    this.is_clone = true;
-                }
-                else {
-                    await Utils.pressKeyToExit(`Cannot find luks-volume file ${this.luksFile}`);
-                }
-            });
-        }
         // 7. Network and hostname
         await this.executeStep("Network configuration", 61, () => this.networkCfg());
         await this.executeStep("Create hostname", 64, () => this.hostname(this.network.domain));
@@ -290,28 +281,37 @@ export default class Sequence {
         // 10. Always remove CLI autologin
         await this.executeStep("Remove autologin CLI", 80, () => this.cliAutologin.remove(this.installTarget));
         // 10. mkinitramfs
-        await this.executeStep("initramfs configure", 86, () => this.initramfsCfg(this.partitions.installationDevice));
-        await this.executeStep("initramfs", 87, () => this.initramfs());
+        await this.executeStep("initramfs configure", 81, () => this.initramfsCfg(this.partitions.installationDevice));
+        await this.executeStep("initramfs", 82, () => this.initramfs());
         // 11. Bootloader configuration
-        await this.executeStep("bootloader-config", 81, () => this.bootloaderConfig());
-        await this.executeStep("grubcfg", 82, () => this.grubcfg());
-        await this.executeStep("bootloader", 83, () => this.bootloader());
+        await this.executeStep("bootloader-config", 83, () => this.bootloaderConfig());
+        await this.executeStep("grubcfg", 84, () => this.grubcfg());
+        await this.executeStep("bootloader", 85, () => this.bootloader());
         // 12. Final system setup
         if (this.distro.familyId === 'debian') {
-            await this.executeStep("Remove sources-yolk", 84, () => this.execCalamaresModule('sources-yolk-undo'));
+            await this.executeStep("Remove sources-yolk", 86, () => this.execCalamaresModule('sources-yolk-undo'));
         }
-        await this.executeStep("Add/remove packages", 85, () => this.packages());
+        await this.executeStep("Add/remove packages", 87, () => this.packages());
         await this.executeStep("Remove GUI installer link", 88, () => this.removeInstallerLink());
         await this.executeStep("Cleanup", 89, async () => {
             await exec(`rm -f ${this.installTarget}/etc/penguins-eggs.d/is_clone`);
-            await exec(`rm -f ${this.installTarget}/etc/penguins-eggs.d/is_crypted_clone`);
         });
+        // 6. homecrypt clone restoration
+        if (fs.existsSync(this.cryptedHomeDevice)) {
+            await this.executeStep("Restoring data from homecrypt", 90, async () => {
+                let restoreHomeCrypt = path.resolve(__dirname, '../../../scripts/restore_homecrypt_krill.sh');
+                await exec(`${restoreHomeCrypt} ${this.cryptedHomeDevice} ${this.installTarget}`);
+            });
+            await this.executeStep("Remove Homecrypt hack", 91, async () => {
+                await this.removeHomecryptHack();
+            });
+        }
         // 13. Custom final steps
         const cfs = new CFS();
         const steps = await cfs.steps();
         if (steps.length > 0) {
             for (const step of steps) {
-                await this.executeStep(`running ${step}`, 90, () => this.execCalamaresModule(step));
+                await this.executeStep(`running ${step}`, 92, () => this.execCalamaresModule(step));
             }
         }
         // 14- Handle chroot if requested
@@ -319,6 +319,8 @@ export default class Sequence {
             const message = `You are in chroot mode under ${this.installTarget}, type "exit" to exit.`;
             await this.emergencyShell(message);
         }
+        // Before to unmount
+        await exec('sync');
         // 15. Unmounting
         await this.executeStep("umount Virtual File System", 96, () => this.umountVfs());
         await this.executeStep("umount File system", 99, () => this.umountFs());

package/dist/krill/components/finished.js

@@ -21,8 +21,8 @@ export default function Finished({ installationDevice = '', hostName = '', userN
     const settings = yaml.load(fs.readFileSync(configRoot + 'settings.conf', 'utf-8'));
     const branding = settings.branding;
     const calamares = yaml.load(fs.readFileSync(configRoot + 'branding/' + branding + '/branding.desc', 'utf-8'));
-    productName = calamares.string_product_name;
-    version = calamares.string_product_version;
+    productName = calamares.strings.productName;
+    version = calamares.strings.version;
     /**
     * totale width=75
     * step width=15

package/dist/krill/components/install.js

@@ -22,8 +22,8 @@ export default function Install({ message = "Install", percent = 0, spinner = fa
     const settings = yaml.load(fs.readFileSync(configRoot + 'settings.conf', 'utf-8'));
     const branding = settings.branding;
     const calamares = yaml.load(fs.readFileSync(configRoot + 'branding/' + branding + '/branding.desc', 'utf-8'));
-    productName = calamares.string_product_name;
-    version = calamares.string_product_version;
+    productName = calamares.strings.productName;
+    version = calamares.strings.version;
     let barLen = 53;
     let progress = Math.round(barLen * percent / 100);
     let todo = barLen - progress;

package/dist/krill/components/keyboard.js

@@ -25,8 +25,8 @@ export default function Keyboard({ keyboardModel = '', keyboardLayout = '', keyb
     const settings = yaml.load(fs.readFileSync(configRoot + 'settings.conf', 'utf-8'));
     const branding = settings.branding;
     const calamares = yaml.load(fs.readFileSync(configRoot + 'branding/' + branding + '/branding.desc', 'utf-8'));
-    productName = calamares.string_product_name;
-    version = calamares.string_product_version;
+    productName = calamares.strings.productName;
+    version = calamares.strings.version;
     /**
     * totale width=75
     * step width=15

package/dist/krill/components/location.js

@@ -25,8 +25,8 @@ export default function Location({ region = '', zone = '', language = '', dateNu
     const settings = yaml.load(fs.readFileSync(configRoot + 'settings.conf', 'utf-8'));
     const branding = settings.branding;
     const calamares = yaml.load(fs.readFileSync(configRoot + 'branding/' + branding + '/branding.desc', 'utf-8'));
-    productName = calamares.string_product_name;
-    version = calamares.string_product_version;
+    productName = calamares.strings.productName;
+    version = calamares.strings.version;
     /**
     * totale width=75
     * step width=15

package/dist/krill/components/network.js

@@ -25,8 +25,8 @@ export default function Network({ iface, addressType, address, netmask, gateway,
     const settings = yaml.load(fs.readFileSync(configRoot + 'settings.conf', 'utf-8'));
     const branding = settings.branding;
     const calamares = yaml.load(fs.readFileSync(configRoot + 'branding/' + branding + '/branding.desc', 'utf-8'));
-    productName = calamares.string_product_name;
-    version = calamares.string_product_version;
+    productName = calamares.strings.productName;
+    version = calamares.strings.version;
     /**
     * totale width=75
     * step width=15

package/dist/krill/components/partitions.js

@@ -29,8 +29,8 @@ export default function Partitions({ installationDevice, installationMode, files
         brandingFile = configRoot + 'branding/' + branding + '/branding.desc';
         if (fs.existsSync(brandingFile)) {
             const calamares = yaml.load(fs.readFileSync(brandingFile, 'utf-8'));
-            productName = calamares.string_product_name;
-            version = calamares.string_product_version;
+            productName = calamares.strings.productName;
+            version = calamares.strings.version;
         }
     }
     /**

package/dist/krill/components/summary.js

@@ -21,8 +21,8 @@ export default function Summary({ username = '', password = '', rootPassword = '
     const settings = yaml.load(fs.readFileSync(configRoot + 'settings.conf', 'utf-8'));
     const branding = settings.branding;
     const calamares = yaml.load(fs.readFileSync(configRoot + 'branding/' + branding + '/branding.desc', 'utf-8'));
-    productName = calamares.string_product_name;
-    version = calamares.string_product_version;
+    productName = calamares.strings.productName;
+    version = calamares.strings.version;
     /**
     * totale width=75
     * step width=15

package/dist/krill/components/users.js

@@ -35,8 +35,8 @@ export default function Users({ username, fullname, password, rootPassword, host
     const settings = yaml.load(fs.readFileSync(configRoot + 'settings.conf', 'utf-8'));
     const branding = settings.branding;
     const calamares = yaml.load(fs.readFileSync(configRoot + 'branding/' + branding + '/branding.desc', 'utf-8'));
-    productName = calamares.string_product_name;
-    version = calamares.string_product_version;
+    productName = calamares.strings.productName;
+    version = calamares.strings.version;
     /**
     * totale width=75
     * step width=15

package/dist/krill/components/welcome.js

@@ -25,8 +25,8 @@ export default function Welcome({ language = '' }) {
     const settings = yaml.load(fs.readFileSync(configRoot + 'settings.conf', 'utf-8'));
     const branding = settings.branding;
     const calamares = yaml.load(fs.readFileSync(configRoot + 'branding/' + branding + '/branding.desc', 'utf-8'));
-    productName = calamares.string_product_name;
-    version = calamares.string_product_version;
+    productName = calamares.strings.productName;
+    version = calamares.strings.version;
     /**
     * totale width=75
     * step width=15

package/dist/lib/utils.d.ts

@@ -48,6 +48,7 @@ export declare const shx: {
     test: (flag: string, pathToCheck: string) => boolean;
     which: (cmd: string) => string | null;
     ln: (flag: string, target: string, link: string) => void;
+    ls: (arg1?: string | string[], arg2?: string | string[]) => string[];
     exec: (command: string, options?: {
         silent?: boolean;
     }) => ShellExecResult;

package/dist/lib/utils.js

@@ -178,6 +178,52 @@ export const shx = {
         }
         fs.symlinkSync(target, link);
     },
+    ls: (arg1, arg2) => {
+        let options = '';
+        let paths = [];
+        // Rilevamento argomenti: ls('-R', path) vs ls(path)
+        if (typeof arg1 === 'string' && arg1.startsWith('-')) {
+            options = arg1;
+            // Se c'è arg2 lo usa, altrimenti default a '.'
+            paths = arg2 ? (Array.isArray(arg2) ? arg2 : [arg2]) : ['.'];
+        }
+        else {
+            // Nessuna opzione, arg1 sono i path. Se null, default a '.'
+            paths = arg1 ? (Array.isArray(arg1) ? arg1 : [arg1]) : ['.'];
+        }
+        const recursive = options.includes('R');
+        let results = [];
+        paths.forEach(p => {
+            if (!fs.existsSync(p))
+                return;
+            const stat = fs.statSync(p);
+            if (stat.isDirectory()) {
+                if (recursive) {
+                    // Funzione ricorsiva interna
+                    const walk = (dir) => {
+                        const files = fs.readdirSync(dir);
+                        files.forEach(f => {
+                            const fullPath = path.join(dir, f);
+                            results.push(fullPath); // Aggiunge il path completo
+                            if (fs.statSync(fullPath).isDirectory()) {
+                                walk(fullPath);
+                            }
+                        });
+                    };
+                    walk(p);
+                }
+                else {
+                    // Comportamento standard: ritorna solo i nomi dei file nella cartella
+                    results = results.concat(fs.readdirSync(p));
+                }
+            }
+            else {
+                // È un file singolo
+                results.push(p);
+            }
+        });
+        return results;
+    },
     exec: (command, options = {}) => {
         const env = getCleanEnv();
         const spawnOpts = {

package/manpages/doc/man/eggs.html

@@ -6,12 +6,12 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
   </head>
   <body>
-    <h1>eggs(1) -- the reproductive system of penguins: eggs v25.12.7</h1>
+    <h1>eggs(1) -- the reproductive system of penguins: eggs v25.12.8</h1>
     <h1>SYNOPSIS</h1>
     <p>eggs is a console utility, in active development, who let you to remaster your system and redistribuite it as live ISO image.</p>
     <h1>INSTALL</h1>
     <p>penguins-eggs as an AppImage, it can be installed on all supported distributions. Download it from https://github.com/pieroproietti/penguins-eggs/releases, then run the following commands:</p>
-    <pre><code>$ chmod +x penguins-eggs_25.12.7-1_amd64-x86_64.AppImage
+    <pre><code>$ chmod +x penguins-eggs_25.12.8-1_amd64-x86_64.AppImage
 $ sudo mv /usr/local/bin
 $ sudo eggs setup
 </code></pre>
@@ -19,30 +19,30 @@ $ sudo eggs setup
     <pre><code>$ doas apk add penguins-eggs@testing
 </code></pre>
     <p>AlmaLinux/RockyLinux</p>
-    <pre><code>$ sudo dnf install ./penguins-eggs_25.12.7-1_amd64-1rocky9.5..x86_64.rpm
+    <pre><code>$ sudo dnf install ./penguins-eggs_25.12.8-1_amd64-1rocky9.5..x86_64.rpm
 
 </code></pre>
     <p>Arch</p>
     <pre><code>$ sudo pacman -S penguins-eggs
-$ sudo pacman -U penguins-eggs_25.12.7-1_amd64-1-x86_64.pkg.tar.zst
+$ sudo pacman -U penguins-eggs_25.12.8-1_amd64-1-x86_64.pkg.tar.zst
 </code></pre>
     <p>Debian/Devuan/Ubuntu</p>
     <pre><code>$ sudo apt install penguins-eggs
-$ sudo dpkg -i penguins-eggs_25.12.7-1_amd64.deb
+$ sudo dpkg -i penguins-eggs_25.12.8-1_amd64.deb
 </code></pre>
     <p>Fedora</p>
-    <pre><code>$ sudo dnf install ./penguins-eggs_25.12.7-1_amd64-1fedora.x86_64.rpm
+    <pre><code>$ sudo dnf install ./penguins-eggs_25.12.8-1_amd64-1fedora.x86_64.rpm
 </code></pre>
     <p>Manjaro</p>
     <pre><code>$ sudo pamac install penguins-eggs
 </code></pre>
     <p>OpenMamba</p>
-    <pre><code>$ sudo dnf install ./penguins-eggs_25.12.7-1_amd64-1mamba.x86_64.rpm
+    <pre><code>$ sudo dnf install ./penguins-eggs_25.12.8-1_amd64-1mamba.x86_64.rpm
 </code></pre>
     <h1>USAGE</h1>
     <pre><code>$ eggs (-v|--version|version)
 
-penguins-eggs/25.12.7  
+penguins-eggs/25.12.8  
 $ eggs --help [COMMAND]
 
 USAGE