penguins-eggs 10.1.1 → 25.7.10

package/dist/classes/cli-autologin.js

@@ -38,18 +38,21 @@ export default class CliAutologin {
             /**
              * systemd
              */
-            Utils.warning("creating CLI autologin systemd");
+            Utils.warning("systemd: creating CLI autologin");
             const fileOverride = `${chroot}/etc/systemd/system/getty@.service.d/override.conf`;
             const dirOverride = path.dirname(fileOverride);
             if (fs.existsSync(dirOverride)) {
                 shx.exec(`rm ${dirOverride} -rf`);
             }
-            shx.exec(`mkdir ${dirOverride}`);
-            let content = '';
-            content += '[Service]' + '\n';
-            content += 'ExecStart=' + '\n';
-            content += 'ExecStart=-/sbin/agetty --noclear --autologin ' + user + ' %I $TERM' + '\n';
-            fs.writeFileSync(fileOverride, content);
+            // ecludo Opensuse ha un'altro sistema
+            if (distro !== 'Opensuse') {
+                shx.exec(`mkdir ${dirOverride}`);
+                let content = '';
+                content += '[Service]' + '\n';
+                content += 'ExecStart=' + '\n';
+                content += 'ExecStart=-/sbin/agetty --noclear --autologin ' + user + ' %I $TERM' + '\n';
+                fs.writeFileSync(fileOverride, content);
+            }
             shx.exec(`chmod +x ${fileOverride}`);
             await this.addIssue(distro, version, user, userPasswd, rootPasswd, chroot);
             await this.addMotd(distro, version, user, userPasswd, rootPasswd, chroot);
@@ -58,7 +61,7 @@ export default class CliAutologin {
             /**
              * openrc
              */
-            Utils.warning("creating CLI autologin openrc");
+            Utils.warning("openrc: creating CLI autologin");
             const inittab = chroot + '/etc/inittab';
             let content = '';
             const search = `tty1::respawn:/sbin/getty 38400 tty1`;
@@ -70,6 +73,7 @@ export default class CliAutologin {
                 }
                 content += lines[i] + '\n';
             }
+            console.log(`Writing ${inittab}`);
             fs.writeFileSync(inittab, content, 'utf-8');
             const autologin = chroot + '/bin/autologin';
             content = '#!/bin/sh' + '\n';
@@ -83,7 +87,7 @@ export default class CliAutologin {
             /**
              * sysvinit
              */
-            Utils.warning("creating CLI autologin sysvinit");
+            Utils.warning("sysvinit: creating CLI autologin");
             const inittab = chroot + '/etc/inittab';
             const search = '1:2345:respawn:/sbin/getty';
             const replace = `1:2345:respawn:/sbin/getty --autologin ${user} 38400 tty1`;
@@ -95,6 +99,7 @@ export default class CliAutologin {
                 }
                 content += lines[i] + '\n';
             }
+            console.log(`Writing ${inittab}`);
             fs.writeFileSync(inittab, content, 'utf-8');
             await this.addMotd(distro, version, user, userPasswd, rootPasswd, chroot);
             await this.addIssue(distro, version, user, userPasswd, rootPasswd, chroot);

package/dist/classes/daddy.js

@@ -11,6 +11,7 @@ import yaml from 'js-yaml';
 import fs from 'node:fs';
 // _dirname
 import path from 'node:path';
+import { exec } from '../lib/utils.js';
 // We need to remove .js extension from import
 import Pacman from '../classes/pacman.js';
 import Settings from '../classes/settings.js';
@@ -118,7 +119,14 @@ export default class Daddy {
             config.compression = 'fast';
             if (reset || isCustom) {
                 if (config.snapshot_prefix === '') {
-                    config.snapshot_prefix = Utils.snapshotPrefix(this.settings.distro.distroId, this.settings.distro.codenameId);
+                    let fstype = ((await exec(`findmnt -n -o FSTYPE /`, { capture: true })).data.trim());
+                    if (fstype !== 'ext4') {
+                        fstype += '-';
+                    }
+                    else {
+                        fstype = '';
+                    }
+                    config.snapshot_prefix = Utils.snapshotPrefix(this.settings.distro.distroId, this.settings.distro.codenameId) + fstype;
                 }
                 jsonConf = JSON.stringify(config);
             }

package/dist/classes/distro.js

@@ -62,13 +62,6 @@ const FAMILY_CONFIGS = {
         codenameLikeId: 'openmamba',
         liveMediumPath: '/run/initramfs/live/'
     },
-    aldus: {
-        familyId: 'aldus',
-        distroLike: 'Aldus',
-        codenameId: 'rolling',
-        codenameLikeId: 'aldus',
-        liveMediumPath: '/run/initramfs/live/'
-    },
     voidlinux: {
         familyId: 'voidlinux',
         distroLike: 'Voidlinux',
@@ -116,8 +109,6 @@ class DistroDetector {
             return 'opensuse';
         if (distroId === 'Voidlinux')
             return 'voidlinux';
-        if (distroId === 'Aldus')
-            return 'aldus';
         return null;
     }
     static detectByCodename(codenameId) {

package/dist/classes/incubation/incubator.d/fedora.d.ts

@@ -0,0 +1,32 @@
+/**
+ * ./src/classes/incubation/distros/opensuse.ts
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
+import { IDistro, IInstaller, IRemix } from '../../../interfaces/index.js';
+/**
+ *
+ */
+export declare class Fedora {
+    distro: IDistro;
+    installer: IInstaller;
+    isClone: boolean;
+    release: boolean;
+    remix: IRemix;
+    theme: string;
+    user_opt: string;
+    verbose: boolean;
+    /**
+     * @param remix
+     * @param distro
+     * @param displaymanager
+     * @param verbose
+     */
+    constructor(installer: IInstaller, remix: IRemix, distro: IDistro, user_opt: string, release?: boolean, theme?: string, isClone?: boolean, verbose?: boolean);
+    /**
+     * locale, partitions, users can come from themes
+     */
+    create(): Promise<void>;
+}

package/dist/classes/incubation/incubator.d/fedora.js

@@ -0,0 +1,79 @@
+/**
+ * ./src/classes/incubation/distros/opensuse.ts
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
+import CFS from '../../../krill/classes/cfs.js';
+import Fisherman from '../fisherman.js';
+/**
+ *
+ */
+export class Fedora {
+    distro;
+    installer = {};
+    isClone = false;
+    release = false;
+    remix;
+    theme;
+    user_opt;
+    verbose = false;
+    /**
+     * @param remix
+     * @param distro
+     * @param displaymanager
+     * @param verbose
+     */
+    constructor(installer, remix, distro, user_opt, release = false, theme = 'eggs', isClone = false, verbose = false) {
+        this.installer = installer;
+        this.remix = remix;
+        this.distro = distro;
+        this.user_opt = user_opt;
+        this.verbose = verbose;
+        this.release = release;
+        this.theme = theme;
+        this.isClone = isClone;
+    }
+    /**
+     * locale, partitions, users can come from themes
+     */
+    async create() {
+        const fisherman = new Fisherman(this.distro, this.installer, this.verbose);
+        await fisherman.createCalamaresSettings(this.theme, this.isClone);
+        await fisherman.buildModule('welcome');
+        await fisherman.buildModule('partition', this.theme);
+        await fisherman.buildModule('mount');
+        await fisherman.moduleUnpackfs();
+        await fisherman.buildModule('machineid');
+        await fisherman.buildModule('fstab');
+        await fisherman.buildModule('services-systemd');
+        await fisherman.buildModule('locale', this.theme);
+        await fisherman.buildModule('keyboard');
+        await fisherman.buildModule('localecfg');
+        await fisherman.buildModule('plymouthcfg');
+        // await fisherman.buildModule('luksbootkeyfile')
+        await fisherman.buildModule('dracutcfg');
+        await fisherman.buildModule('users', this.theme);
+        await fisherman.moduleDisplaymanager();
+        await fisherman.buildModule('networkcfg');
+        await fisherman.buildModule('hwclock');
+        await fisherman.buildModule('dracut');
+        await fisherman.buildModule('grubcf');
+        await fisherman.buildModule('bootloader');
+        await fisherman.moduleRemoveuser(this.user_opt);
+        await fisherman.modulePackages(this.distro, this.release);
+        /**
+         * cfs: custom final steps
+         */
+        const cfs = new CFS();
+        const steps = await cfs.steps();
+        if (steps.length > 0) {
+            for (const step of steps) {
+                await fisherman.buildCalamaresModule(step, true, this.theme);
+            }
+        }
+        await fisherman.buildModule('umount');
+        await fisherman.moduleFinished();
+    }
+}

package/dist/classes/incubation/incubator.d/opensuse.js

@@ -47,24 +47,22 @@ export class Opensuse {
         await fisherman.moduleUnpackfs();
         await fisherman.buildModule('machineid');
         await fisherman.buildModule('fstab');
+        await fisherman.buildModule('services-systemd');
         await fisherman.buildModule('locale', this.theme);
         await fisherman.buildModule('keyboard');
         await fisherman.buildModule('localecfg');
+        await fisherman.buildModule('plymouthcfg');
+        // await fisherman.buildModule('luksbootkeyfile')
         await fisherman.buildModule('dracutcfg');
         await fisherman.buildModule('users', this.theme);
         await fisherman.moduleDisplaymanager();
         await fisherman.buildModule('networkcfg');
         await fisherman.buildModule('hwclock');
-        await fisherman.buildModule('services-systemd');
         await fisherman.buildModule('dracut');
         await fisherman.buildModule('grubcf');
         await fisherman.buildModule('bootloader');
-        await fisherman.modulePackages(this.distro, this.release);
-        //await fisherman.buildModule('luksbootkeyfile')
-        await fisherman.buildModule('plymouthcfg');
-        //await fisherman.buildModule('mkinitfs')
         await fisherman.moduleRemoveuser(this.user_opt);
-        // await fisherman.buildCalamaresModule('cleanup', true)
+        await fisherman.modulePackages(this.distro, this.release);
         /**
          * cfs: custom final steps
          */

package/dist/classes/incubation/incubator.d/rolling.js

@@ -60,10 +60,8 @@ export class Rolling {
         await fisherman.modulePackages(this.distro, this.release);
         await fisherman.buildModule('luksbootkeyfile');
         await fisherman.buildModule('plymouthcfg');
-        // await fisherman.buildModule('initramfscfg')
-        // await fisherman.buildModule('initramfs')
         await fisherman.moduleRemoveuser(this.user_opt);
-        await fisherman.shellprocess('removelink');
+        await fisherman.shellprocess('sync');
         /**
          * cfs: custom final steps
          */

package/dist/classes/incubation/incubator.js

@@ -24,6 +24,7 @@ import { Alpine } from './incubator.d/alpine.js';
 import { Bionic } from './incubator.d/bionic.js';
 import { Buster } from './incubator.d/buster.js';
 import { Jessie } from './incubator.d/jessie.js';
+import { Fedora } from './incubator.d/fedora.js';
 import { Noble } from './incubator.d/noble.js';
 import { Openmamba } from './incubator.d/openmamba.js';
 import { Opensuse } from './incubator.d/opensuse.js';
@@ -70,16 +71,9 @@ export default class Incubator {
         this.createBranding();
         const codenameLikeId = this.distro.codenameLikeId;
         /**
-         * aldos
+         * Alpine
          */
-        if (codenameLikeId === 'aldos') {
-            const aldos = new Openmamba(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.isClone, this.verbose);
-            await aldos.create();
-            /**
-             * Alpine
-             */
-        }
-        else if (codenameLikeId === 'alpine') {
+        if (codenameLikeId === 'alpine') {
             const alpine = new Alpine(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.isClone, this.verbose);
             await alpine.create();
             /**
@@ -140,7 +134,7 @@ export default class Incubator {
              */
         }
         else if (codenameLikeId === 'fedora') {
-            const fedora = new Rolling(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.isClone, this.verbose);
+            const fedora = new Fedora(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.isClone, this.verbose);
             await fedora.create();
             /**
              * openmamba
@@ -369,7 +363,8 @@ async function partitionCustomize() {
     let test = await exec(`df -T / | awk 'NR==2 {print $2}'`, { capture: true, echo: false });
     partition.defaultFileSystemType = test.data.trim();
     partition.availableFileSystemTypes = ['ext4'];
-    if (Pacman.packageIsInstalled('btrfs-progs')) {
+    if (Pacman.packageIsInstalled('btrfs-progs') ||
+        Pacman.packageIsInstalled('btrfsprogs')) {
         partition.availableFileSystemTypes.push('btrfs');
     }
     if (Pacman.packageIsInstalled('xfsprogs')) {

package/dist/classes/ovary.d/fertilization.js

@@ -20,6 +20,7 @@ export async function fertilization(snapshot_prefix = '', snapshot_basename = ''
     const distro = new Distro();
     this.familyId = distro.familyId;
     this.distroId = distro.distroId;
+    this.distroLike = distro.distroLike;
     this.settings = new Settings();
     if (await this.settings.load()) {
         await this.settings.loadRemix(this.theme);

package/dist/classes/ovary.d/initrd.js

@@ -5,7 +5,6 @@
  * email: piero.proietti@gmail.com
  * license: MIT
  */
-// packages
 import fs from 'fs';
 import path from 'node:path';
 // classes
@@ -19,13 +18,10 @@ const __dirname = path.dirname(new URL(import.meta.url).pathname);
  */
 export async function initrdAlpine() {
     Utils.warning(`creating ${path.basename(this.initrd)} Alpine on ISO/live`);
-    const sidecar = path.resolve(__dirname, `../../../mkinitfs/initramfs-init.in`);
-    Utils.warning(`Adding ${sidecar} to /usr/share/mkinitfs/initramfs-init`);
-    await exec(`cp ${sidecar} /usr/share/mkinitfs/initramfs-init`);
     let initrdImg = Utils.initrdImg();
     initrdImg = initrdImg.slice(Math.max(0, initrdImg.lastIndexOf('/') + 1));
-    const pathConf = path.resolve(__dirname, `../../mkinitfs/live.conf`);
-    await exec(`mkinitfs -c ${pathConf} -o ${this.settings.iso_work}live/${initrdImg}`, Utils.setEcho(true));
+    const pathConf = path.resolve(__dirname, `../../../mkinitfs/live.conf`);
+    await exec(`mkinitfs -c ${pathConf} -o ${this.settings.iso_work}live/${initrdImg} ${this.kernel}`, this.echo);
 }
 /**
  * initrdArch
@@ -33,15 +29,36 @@ export async function initrdAlpine() {
 export async function initrdArch() {
     Utils.warning(`creating ${path.basename(this.initrd)} using mkinitcpio on ISO/live`);
     let dirConf = 'arch';
+    let tool = 'archiso';
+    let hookSrc = '/usr/lib/initcpio/hooks/archiso_pxe_http';
+    let hookDest = '/etc/initcpio/hooks/archiso_pxe_http';
+    let edit = `sed -i 's/export copytoram="y"/# export copytoram="y"/' ${hookDest}`;
     if (Diversions.isManjaroBased(this.distroId)) {
         dirConf = 'manjaro';
+        tool = 'miso';
+        hookSrc = `/etc/initcpio/hooks/miso_pxe_http`;
+        hookDest = hookSrc;
+        edit = `sed -i 's/copytoram="y"/# copytoram="y"/' ${hookDest}`;
         if (this.distroId === "Biglinux" || this.distroId === "Bigcommunity") {
             dirConf = 'biglinux';
         }
     }
-    const pathConf = path.resolve(__dirname, `../../../mkinitcpio/${dirConf}/live.conf`);
-    let cmd = `mkinitcpio -c ${pathConf} -g ${this.settings.iso_work}live/${path.basename(this.initrd)} -k ${this.kernel}`;
+    const restore = fs.existsSync(hookDest);
+    const pathConf = path.resolve(__dirname, `../../../mkinitcpio/${dirConf}`);
+    const fileConf = pathConf + '/live.conf';
+    let hookSaved = `/tmp/${path.basename(hookSrc)}`;
+    if (hookSrc !== hookDest) {
+        await exec(`cp ${hookSrc} ${hookDest}`);
+    }
+    await exec(`cp ${hookSrc} ${hookSaved}`);
+    await exec(edit, this.echo);
+    let cmd = `mkinitcpio -c ${fileConf} -g ${this.settings.iso_work}live/${path.basename(this.initrd)} -k ${this.kernel}`;
     await exec(cmd, this.echo);
+    await exec(`rm -f ${hookDest}`);
+    if (restore) {
+        await exec(`cp ${hookSaved} ${hookDest}`);
+    }
+    await exec(`rm -f ${hookSaved}`);
 }
 /**
  * initrdDebian
@@ -63,6 +80,18 @@ export async function initrdDebian(verbose = false) {
 */
 export async function initrdDracut() {
     Utils.warning(`creating ${path.basename(this.initrd)} using dracut on ISO/live`);
-    const confdir = path.resolve(__dirname, `../../../dracut/dracut.conf.d`);
-    await exec(`dracut --confdir ${confdir} ${this.settings.iso_work}live/${path.basename(this.initrd)}  ${this.kernel}`, this.echo);
+    const prefix = this.settings.config.snapshot_prefix;
+    const confdir = '--confdir ' + path.resolve(__dirname, `../../../dracut/dracut.conf.d`);
+    // const dracutdir='--dracutdir /opt/penguins-eggs/dracut'
+    const dracutdir = '';
+    const dest = `${this.settings.iso_work}live/${path.basename(this.initrd)}`;
+    const log = `> ${this.settings.iso_work}${prefix}dracut.log.txt 2>&1`;
+    const kmoddir = `--kmoddir /lib/modules/${this.kernel}`;
+    const cmd = `dracut --force --debug --no-hostonly ${confdir} ${kmoddir} ${dest} ${this.kernel} ${log}`;
+    //const cmd=`ls -la /lib /lib/modules ${log}`
+    console.log(cmd);
+    await exec(cmd, this.echo);
+    // clean per btrfs
+    let clean = `../../../scripts/99clean ${this.kernel}`;
+    await exec(clean, this.echo);
 }

package/dist/classes/ovary.d/make-dot-disk.js

@@ -19,9 +19,6 @@ const __dirname = path.dirname(new URL(import.meta.url).pathname);
    * makeDotDisk
    */
 export function makeDotDisk(info = '', mksquashfs = '', mkisofs = '') {
-    if (this.verbose) {
-        console.log('Ovary: makeDotDisk');
-    }
     const dotDisk = this.settings.iso_work + '.disk';
     if (fs.existsSync(dotDisk)) {
         shx.rm('-rf', dotDisk);
@@ -29,12 +26,25 @@ export function makeDotDisk(info = '', mksquashfs = '', mkisofs = '') {
     shx.mkdir('-p', dotDisk);
     let text = `# Created at: ${Utils.formatDate(new Date())}\n`;
     text += `# penguins_eggs v. ${Utils.getPackageVersion()}\n`;
-    // .disk/info
-    fs.writeFileSync(dotDisk + '/info', text, 'utf-8');
-    shx.mkdir('-p', path.join(dotDisk, 'id'));
-    fs.writeFileSync(path.join(dotDisk, '/id', this.uuid), this.uuid, 'utf-8');
-    // .disk/mksquashfs
-    fs.writeFileSync(dotDisk + '/mksquashfs', text + mksquashfs, 'utf-8');
-    // .disk/mkisofs
-    fs.writeFileSync(dotDisk + '/mkisofs', text + mkisofs, 'utf-8');
+    /**
+     * write test as .disk/info
+     */
+    fs.writeFileSync(path.join(dotDisk, 'info'), text, 'utf-8');
+    /**
+     * write mksquashfs as .disk/mksquashfs
+     */
+    fs.writeFileSync(path.join(dotDisk, 'mksquashfs'), mksquashfs, 'utf-8');
+    /**
+     * write mkisofs as .disk/mkisofs
+     */
+    fs.writeFileSync(path.join(dotDisk, 'mkisofs'), mkisofs, 'utf-8');
+    /**
+     * touch uuid as file name on .disk/id
+     *
+     * This is a DEBIAN standard
+     */
+    if (this.uuid && this.uuid.trim() !== '') {
+        shx.mkdir(path.join(dotDisk, 'id'));
+        shx.touch(path.join(dotDisk, 'id', this.uuid));
+    }
 }

package/dist/classes/ovary.d/make-efi.d.ts

@@ -7,6 +7,10 @@
  */
 import Ovary from '../ovary.js';
 /**
- * makeEFI
+ *
+ * @param this
+ * @param theme
+ * cp /usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed ./bootloaders/
+ * cp /usr/lib/shim/shimx64.efi.signed ./bootloaders/
  */
 export declare function makeEfi(this: Ovary, theme?: string): Promise<void>;