penguins-eggs 10.1.1 → 25.7.10

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

@@ -16,40 +16,32 @@ import Utils from '../utils.js';
 // _dirname
 const __dirname = path.dirname(new URL(import.meta.url).pathname);
 /**
- * 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 async function makeEfi(theme = 'eggs') {
-    Utils.warning("creating efi configuration...");
+    const bootloaders = path.resolve(__dirname, `../../../bootloaders`);
+    const grubEfi = path.resolve(bootloaders, `grubx64.efi`);
+    const shimEfi = path.resolve(bootloaders, `shimx64.efi`);
+    let signed = '';
+    if (this.distroLike === 'Debian') {
+        Utils.warning(`Secure boot enabled on ${this.distroLike}`);
+        signed = '.signed';
+    }
     const efiPath = path.join(this.settings.config.snapshot_mnt, '/efi/');
     const efiWorkDir = path.join(efiPath, '/work/');
     const efiMemdiskDir = path.join(efiPath, '/memdisk/');
-    const efiMnt = path.join(efiPath, '/mnt/');
+    const efiMnt = path.join(efiPath, 'mnt');
     const isoDir = this.settings.iso_work;
-    const readmes = `${isoDir}/READMES`;
-    let readmeContent = `# README\n`;
-    /**
-     * check: grub/grub2 command MUST to exists
-     */
-    const grubName = Diversions.grubName(this.familyId);
-    if (grubName === '') {
-        Utils.error('Cannot find command grub/grub2.');
-        process.exit(1);
-    }
-    /**
-     * GAE = Grub Arch Efi path+grubx86.efi/signed
-     */
-    let GAE = srcGAES();
-    if (!fs.existsSync(srcGAE())) {
-        GAE = srcGAE();
-    }
-    if (!fs.existsSync(GAE)) {
-        if (this.familyId === 'debian') {
-            console.log(`error: cannot find ${GAE}`);
-            process.exit(1);
-        }
-    }
-    // Create READMES on ISO
-    await exec(`mkdir ${readmes}`);
+    // creo e copio direttamente in ${isdDir} il folder ${bootloaders}/grub/x86_64-efi
+    await exec(`mkdir ${isoDir}/boot/grub/ -p`, this.echo);
+    await exec(`cp -r ${bootloaders}/grub/x86_64-efi ${isoDir}/boot/grub/`, this.echo);
+    await exec(`mkdir ${isoDir}/EFI/boot -p`, this.echo);
+    await exec(`cp ${shimEfi}${signed} ${isoDir}/EFI/boot/${bootEFI()}`, this.echo);
+    await exec(`cp ${grubEfi}${signed} ${isoDir}/EFI/boot/${grubEFI()}`, this.echo);
     // clean/create all in efiPath
     if (fs.existsSync(efiPath)) {
         await exec(`rm -rf ${efiPath}`);
@@ -58,21 +50,19 @@ export async function makeEfi(theme = 'eggs') {
     await exec(`mkdir ${efiMemdiskDir}`, this.echo);
     await exec(`mkdir ${efiMnt}`, this.echo);
     await exec(`mkdir ${efiWorkDir}`, this.echo);
-    const grub1 = `${efiMemdiskDir}/boot/grub/grub.cfg`;
-    let grubText1 = `# grub.cfg 1\n`;
     /**
      * create efi.img
      */
-    await exec(`mkdir ${path.join(efiMemdiskDir, "/boot")}`, this.echo);
-    await exec(`mkdir ${path.join(efiMemdiskDir, "/boot/grub")}`, this.echo);
-    // create grub.cfg 1 in memdisk
-    Utils.warning("creating grub.cfg (1) in (efi.img)/boot/grub");
+    Utils.warning("creating grub.cfg (1) on efi.img");
+    await exec(`mkdir ${path.join(efiMemdiskDir, "/boot/grub -p")}`, this.echo);
+    const grubCfg1 = `${efiMemdiskDir}/boot/grub/grub.cfg`;
+    let grubText1 = `# grub.cfg 1\n`;
     grubText1 += `# created on ${efiMemdiskDir}\n`;
     grubText1 += `\n`;
     grubText1 += `search --set=root --file /.disk/id/${this.uuid}\n`;
     grubText1 += 'set prefix=($root)/boot/grub\n';
     grubText1 += `configfile ($root)/boot/grub/grub.cfg\n`;
-    Utils.write(grub1, grubText1);
+    Utils.write(grubCfg1, grubText1);
     /**
      * creating structure efiWordDir
      */
@@ -91,55 +81,24 @@ export async function makeEfi(theme = 'eggs') {
     const efiImg = `${efiWorkDir}boot/grub/efi.img`;
     await exec(`dd if=/dev/zero of=${efiImg} bs=1M count=16`, this.echo);
     await exec(`/sbin/mkdosfs -F 12 ${efiImg}`, this.echo);
-    // mount efi.img on mnt-img
-    await exec(`mount -o loop ${efiImg} ${efiMnt}`, this.echo);
-    // create structure inside efiMnt
-    await exec(`mkdir ${efiMnt}/boot`, this.echo);
-    await exec(`mkdir ${efiMnt}/boot/grub`, this.echo);
-    await exec(`mkdir ${efiMnt}/boot/grub/x86_64-efi`, this.echo);
-    await exec(`cp -r /usr/lib/grub/x86_64-efi/*.mod ${efiMnt}/boot/grub/x86_64-efi/`, this.echo);
-    await exec(`mkdir ${efiMnt}/EFI`, this.echo);
-    await exec(`mkdir ${efiMnt}/EFI/boot`, this.echo);
+    // await new Promise(resolve => setTimeout(resolve, 2000))
+    // mount efi.img on mountpoint mnt-img
+    await exec(`mount --make-shared -o loop ${efiImg} ${efiMnt}`, this.echo);
+    // await new Promise(resolve => setTimeout(resolve, 2000))
+    // create structure inside (efi.img)
+    await exec(`mkdir -p ${efiMnt}/boot/grub`, this.echo);
+    await exec(`mkdir -p ${efiMnt}/EFI/boot`, this.echo);
     /**
-     * copy grub.cfg to (efi.img)/boot/grub
+     * copy grubCfg1 (grub.cfg) to (efi.img)/boot/grub
      */
-    await exec(`cp ${grub1} ${efiMnt}/boot/grub`);
-    // readme
-    readmeContent += `## copyng on (efi.img) ${efiMnt}\n`;
-    readmeContent += `${grub1} copied to /boot/grub`;
-    if (this.settings.distro.codenameLikeId === 'bookworm' ||
-        this.settings.distro.codenameLikeId === 'daedalus') {
-        /**
-         * (efi.img)/EFI/boot/bootx84.efi (shimx64.efi)
-         * (efi.img)/EFI/boot/grubx84.efi
-         */
-        Utils.warning(`copy ${srcShim()} to ${efiMnt}/EFI/boot/${bootArchEfi()}`);
-        Utils.warning(`copy ${srcGAES()} to ${efiMnt}/EFI/boot/${nameGAE()}`);
-        await exec(`cp ${srcShim()} ${efiMnt}/EFI/boot/${bootArchEfi()}`, this.echo);
-        await exec(`cp ${srcGAES()} ${efiMnt}/EFI/boot/${nameGAE()}`, this.echo);
-        readmeContent += `${srcShim()} copied as  ${bootArchEfi()}\n`;
-        readmeContent += `${GAE} copied as ${nameGAE()}\n`;
-    }
-    else {
-        /**
-         * we need to build bootx64.efi
-         */
-        Utils.warning(`create ${bootArchEfi()} not signed and copy as ${bootArchEfi()}`);
-        await exec(`${grubName}-mkimage  -O "${Utils.uefiFormat()}" \
-                -m "${efiMemdiskDir}/memdisk" \
-                -o "${efiMemdiskDir}/${bootArchEfi()}" \
-                -p '(memdisk)/boot/grub' \
-                search iso9660 configfile normal memdisk tar cat part_msdos part_gpt fat ext2 ntfs ntfscomp hfsplus chain boot linux squash4 loopback`, this.echo);
-        await exec(`cp ${efiMemdiskDir}/${bootArchEfi()} ${efiMnt}/EFI/boot/`, this.echo);
-        // Rolf patch: copiare i file mod da /usr/lib/grub/x86_64-efi a ${isoDir}/boot/grub/x86_64-efi
-        await exec(`cp -r /usr/lib/grub/x86_64-efi/*.mod ${isoDir}/boot/grub/x86_64-efi/`, this.echo);
-        // Creare EFI
-        readmeContent += `created grubx64.efi not signed and copied as  ${bootArchEfi()}\n`;
-    }
-    // replicate EFI on ISO
-    await exec(`cp -r ${efiMnt}/EFI ${isoDir}/EFI`, this.echo);
-    // umount efiMnt
+    await exec(`cp ${grubCfg1} ${efiMnt}/boot/grub`, this.echo);
+    await exec(`cp ${shimEfi}${signed} ${efiMnt}/EFI/boot/${bootEFI()}`, this.echo);
+    await exec(`cp ${grubEfi}${signed} ${efiMnt}/EFI/boot/${grubEFI()}`, this.echo);
+    //await Utils.pressKeyToExit(`controlla ${efiMnt}`)
     await exec(`umount ${efiMnt}`, this.echo);
+    // Copy isoImg in ${${isoDir}/boot/grub
+    Utils.warning("copyng efi.img on (iso)/boot/grub");
+    await exec(`cp ${efiImg} ${isoDir}/boot/grub`, this.echo);
     /**
      * creating grub.cfg (2) on (iso)/boot/grub
      */
@@ -151,7 +110,7 @@ export async function makeEfi(theme = 'eggs') {
         splashSrc = `${theme}/theme/livecd/splash.png`;
     }
     if (!fs.existsSync(splashSrc)) {
-        Utils.warning('Cannot find: ' + splashSrc);
+        Utils.warning(`warning: ${splashSrc} does not exists`);
         process.exit(1);
     }
     await exec(`cp ${splashSrc} ${splashDest}`, this.echo);
@@ -163,7 +122,7 @@ export async function makeEfi(theme = 'eggs') {
     // copy theme
     const themeDest = `${isoDir}/boot/grub/theme.cfg`;
     if (!fs.existsSync(themeSrc)) {
-        Utils.warning('Cannot find: ' + themeSrc);
+        Utils.error(`error: ${themeSrc} does not exist`);
         process.exit(1);
     }
     fs.copyFileSync(themeSrc, themeDest);
@@ -179,9 +138,6 @@ export async function makeEfi(theme = 'eggs') {
     }
     // Copy workdir files to ISO/boot
     await exec(`rsync -avx  ${efiWorkDir}/boot ${isoDir}/`, this.echo);
-    readmeContent += `\n`;
-    readmeContent += `## Copyng on ${isoDir}\n`;
-    readmeContent += `rsync -avx ${efiWorkDir}/boot (iso)/boot\n`;
     /**
      * prepare main grub.cfg from grub.main.cfg
      */
@@ -190,11 +146,11 @@ export async function makeEfi(theme = 'eggs') {
         grubTemplate = path.resolve(__dirname, '../../../addons/eggs/theme/livecd/grub.main.cfg');
     }
     if (!fs.existsSync(grubTemplate)) {
-        Utils.warning('Cannot find: ' + grubTemplate);
+        Utils.error(`error: ${grubTemplate} does not exist`);
         process.exit(1);
     }
     const kernel_parameters = Diversions.kernelParameters(this.familyId, this.volid); // this.kernelParameters()
-    const g2 = path.join(isoDir, '/boot/grub/grub.cfg');
+    const grubCfg2 = path.join(isoDir, '/boot/grub/grub.cfg');
     const template = fs.readFileSync(grubTemplate, 'utf8');
     const view = {
         fullname: this.settings.remix.fullname.toUpperCase(),
@@ -204,10 +160,10 @@ export async function makeEfi(theme = 'eggs') {
         vmlinuz: `/live/${path.basename(this.vmlinuz)}`
     };
     let grubText2 = `# grub.cfg 2\n`;
-    grubText2 += ` # created on ${g2}`;
+    grubText2 += ` # created on ${grubCfg2}`;
     grubText2 += `\n`;
     grubText2 += mustache.render(template, view);
-    fs.writeFileSync(g2, grubText2);
+    fs.writeFileSync(grubCfg2, grubText2);
     /**
      * create loopback.cfg
      */
@@ -220,16 +176,16 @@ export async function makeEfi(theme = 'eggs') {
      * config.cfg
      */
     await exec(`cp ${path.resolve(__dirname, `../../../assets/config.cfg`)} ${isoDir}/boot/grub`);
-    fs.writeFileSync(`${readmes}/grub1.cfg`, grubText1);
-    fs.writeFileSync(`${readmes}/grub2.cfg`, grubText2);
-    fs.writeFileSync(`${readmes}/README.md`, readmeContent);
 }
+/**
+ * FUNCTIONS
+ */
 /**
  *
  * @returns
  */
-function bootArchEfi() {
-    let bn = 'nothing.efi';
+function bootEFI() {
+    let bn = 'bootia32.efi'; // Per l'architettura i686 EFI è: bootia32.efi
     if (process.arch === 'x64') {
         bn = 'bootx64.efi';
     }
@@ -239,33 +195,19 @@ function bootArchEfi() {
     return bn;
 }
 /**
- * FUNCTIONS
+ *
+ * @returns
  */
-function nameGAE() {
-    let bn = 'nothing.efi';
+function grubEFI() {
+    let gn = 'grubia32.efi'; // Per l'architettura i686 EFI è: grubia32.efi
     if (process.arch === 'x64') {
-        bn = 'grubx64.efi';
+        gn = 'grubx64.efi';
     }
     else if (process.arch === 'arm64') {
-        bn = 'grubaa64.efi';
-    }
-    return bn;
-}
-function nameGAES() {
-    return nameGAE() + '.signed';
-}
-function srcGAE() {
-    return '/usr/lib/grub/' + Utils.uefiFormat() + '/monolithic/' + nameGAE();
-}
-function srcGAES() {
-    let signedGrub = `/usr/lib/grub/${Utils.uefiFormat()}-signed/${nameGAES()}`;
-    if (!fs.existsSync(signedGrub)) {
-        Utils.warning(`cannot find ${signedGrub}`);
+        gn = 'grubaa64.efi';
     }
-    return signedGrub;
+    return gn;
 }
-function srcShim() {
-    const signedShim = '/usr/lib/shim/shimx64.efi.signed';
-    const unsignedShim = '/usr/lib/shim/shimx64.efi';
-    return fs.existsSync(signedShim) ? signedShim : unsignedShim;
+function moduleEFI() {
+    return `x86_64-efi`;
 }

package/dist/classes/ovary.d/merged.d.ts

@@ -9,7 +9,7 @@ import Ovary from '../ovary.js';
 /**
  * Ritorna true se c'è bisogno del mount --bind
  *
- * Ci sono tre tipologie:
+ * Ci sono quattro tipologie:
  *
  * - copied
  * - mergedAndOverlay

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

@@ -12,7 +12,7 @@ const __dirname = path.dirname(new URL(import.meta.url).pathname);
 /**
  * Ritorna true se c'è bisogno del mount --bind
  *
- * Ci sono tre tipologie:
+ * Ci sono quattro tipologie:
  *
  * - copied
  * - mergedAndOverlay
@@ -36,7 +36,8 @@ export function copied(dir) {
  *
  */
 export function mergedAndOverlay(dir) {
-    const moDirs = ['usr', 'var'];
+    // per Alpine ho agginto bin
+    const moDirs = ['bin', 'usr', 'var'];
     let mergedOverlay = false;
     for (const moDir of moDirs) {
         if (moDir === dir) {

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

@@ -52,7 +52,8 @@ export async function produce(kernel = '', clone = false, cryptedclone = false,
      */
     if (this.kernel === '') {
         if (this.familyId === 'alpine') {
-            // to do
+            const moduleDirs = fs.readdirSync('/lib/modules');
+            this.kernel = moduleDirs[0];
         }
         else if (this.familyId === 'archlinux') {
             const moduleDirs = fs.readdirSync('/usr/lib/modules');
@@ -189,7 +190,7 @@ export async function produce(kernel = '', clone = false, cryptedclone = false,
             await this.syslinux(this.theme);
             await this.kernelCopy();
             /**
-             * differents initrd for different families
+             * spostare alla fine per dracut
              */
             if (this.familyId === 'alpine') {
                 await this.initrdAlpine();
@@ -277,16 +278,16 @@ export async function produce(kernel = '', clone = false, cryptedclone = false,
          * patch to emulate miso/archiso on archilinux family
          */
         if (this.familyId === 'archlinux') {
-            let pathName = `arch/x86_64/airootfs`;
+            let filesystemName = `arch/x86_64/airootfs.sfs`;
             let hashCmd = 'sha512sum';
             let hashExt = '.sha512';
             if (Diversions.isManjaroBased(this.settings.distro.distroId)) {
-                pathName = `manjaro/x86_64/livefs`;
+                filesystemName = `manjaro/x86_64/livefs.sfs`;
                 hashCmd = `md5sum`;
                 hashExt = '.md5';
             }
-            await exec(`mkdir ${this.settings.iso_work}${pathName}/x86_64 -p`, this.echo);
-            fs.linkSync(`${this.settings.iso_work}live/filesystem.squashfs`, `${this.settings.iso_work}${pathName}.sfs`);
+            await exec(`mkdir ${this.settings.iso_work}${path.dirname(filesystemName)} -p`, this.echo);
+            await exec(`ln ${this.settings.iso_work}live/filesystem.squashfs ${this.settings.iso_work}${filesystemName}`, this.echo);
         }
         await this.makeIso(mkIsofsCmd, scriptOnly);
     }

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

@@ -17,11 +17,12 @@ import Diversions from './../diversions.js';
 import Utils from './../utils.js';
 // _dirname
 const __dirname = path.dirname(new URL(import.meta.url).pathname);
+const bootloaders = path.resolve(__dirname, `../../../bootloaders`);
 /**
    * syslinux: da syspath
    */
 export async function syslinux(theme = 'eggs') {
-    let syspath = path.resolve(__dirname, `../../../syslinux`);
+    let syspath = path.join(bootloaders, 'syslinux');
     await exec(`cp ${syspath}/chain.c32 ${this.settings.iso_work}/isolinux/`, this.echo);
     await exec(`cp ${syspath}/isohdpfx.bin ${this.settings.iso_work}/isolinux/`, this.echo);
     // just fo x64 arch

package/dist/classes/ovary.d/user-create-live.js

@@ -10,6 +10,7 @@ import fs from 'fs';
 import path from 'node:path';
 import yaml from 'js-yaml';
 // functions
+import { exec } from '../../lib/utils.js';
 import rexec from './rexec.js';
 import Utils from '../utils.js';
 // _dirname
@@ -42,16 +43,7 @@ export async function userCreateLive() {
      *
      */
     switch (this.familyId) {
-        case 'debian': {
-            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG sudo ${this.settings.config.user_opt}`, this.verbose));
-            break;
-        }
         case 'alpine': {
-            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG cdrom ${this.settings.config.user_opt}`, this.verbose));
-            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG games ${this.settings.config.user_opt}`, this.verbose));
-            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG input ${this.settings.config.user_opt}`, this.verbose));
-            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG users ${this.settings.config.user_opt}`, this.verbose));
-            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG video ${this.settings.config.user_opt}`, this.verbose));
             cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG wheel ${this.settings.config.user_opt}`, this.verbose));
             break;
         }
@@ -62,6 +54,10 @@ export async function userCreateLive() {
             cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} gpasswd -a ${this.settings.config.user_opt} autologin`, this.verbose));
             break;
         }
+        case 'debian': {
+            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG sudo ${this.settings.config.user_opt}`, this.verbose));
+            break;
+        }
         case 'fedora': {
             cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG wheel ${this.settings.config.user_opt}`, this.verbose));
             break;
@@ -71,10 +67,14 @@ export async function userCreateLive() {
             cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG autologin ${this.settings.config.user_opt}`, this.verbose));
             break;
         }
+        case 'opensuse': {
+            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG wheel ${this.settings.config.user_opt}`, this.verbose));
+            break;
+        }
         // No default
     }
     /**
-     * look to calamares/modules/users.yml for groups
+     * look to calamares/modules/users.conf for groups
      */
     let usersConf = '/etc/calamares/modules/users.conf';
     if (!fs.existsSync(usersConf)) {
@@ -83,7 +83,11 @@ export async function userCreateLive() {
     if (fs.existsSync(usersConf)) {
         const o = yaml.load(fs.readFileSync(usersConf, 'utf8'));
         for (const group of o.defaultGroups) {
-            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG ${group} ${this.settings.config.user_opt}`, this.verbose));
+            const groupExists = await exec(`chroot ${this.settings.work_dir.merged} getent group ${group}`, { ignore: true });
+            if (groupExists.code == 0) {
+                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG ${group} ${this.settings.config.user_opt} ${this.toNull}`, this.verbose));
+                Utils.warning(`added ${this.settings.config.user_opt} to group ${group}`);
+            }
         }
     }
     else {

package/dist/classes/ovary.d.ts

@@ -15,7 +15,7 @@ import { bindVfs, ubindVfs } from './ovary.d/bind-vfs.js';
 import { editLiveFs } from './ovary.d/edit-live-fs.js';
 import { makeSquashfs, addExclusion } from './ovary.d/make-squashfs.js';
 import { makeEfi } from './ovary.d/make-efi.js';
-import { xorrisoCommand } from './ovary.d/xorriso-commend.js';
+import { xorrisoCommand } from './ovary.d/xorriso-command.js';
 import { createXdgAutostart } from './ovary.d/create-xdg-autostart.js';
 import { copied, merged, mergedAndOverlay } from './ovary.d/merged.js';
 import { makeIso } from './ovary.d/make-iso.js';
@@ -38,6 +38,7 @@ export default class Ovary {
     echo: {};
     familyId: string;
     distroId: string;
+    distroLike: string;
     genisoimage: boolean;
     incubator: Incubator;
     nest: string;

package/dist/classes/ovary.js

@@ -15,7 +15,7 @@ import { bindVfs, ubindVfs } from './ovary.d/bind-vfs.js';
 import { editLiveFs } from './ovary.d/edit-live-fs.js';
 import { makeSquashfs, addExclusion } from './ovary.d/make-squashfs.js';
 import { makeEfi } from './ovary.d/make-efi.js';
-import { xorrisoCommand } from './ovary.d/xorriso-commend.js';
+import { xorrisoCommand } from './ovary.d/xorriso-command.js';
 import { createXdgAutostart } from './ovary.d/create-xdg-autostart.js';
 import { copied, merged, mergedAndOverlay } from './ovary.d/merged.js';
 import { makeIso } from './ovary.d/make-iso.js';
@@ -40,6 +40,7 @@ export default class Ovary {
     echo = {};
     familyId = '';
     distroId = '';
+    distroLike = '';
     genisoimage = false;
     incubator = {};
     nest = '';

package/dist/classes/pacman.d/alpine.js

@@ -15,8 +15,8 @@ import Utils from '../utils.js';
 export default class Alpine {
     static packs4calamares = [
         'calamares',
+        'calamares-dev',
         'calamares-doc',
-        'calamares-extensions',
         'calamares-lang',
         'calamares-mod-bootloader',
         'calamares-mod-displaymanager',
@@ -26,21 +26,25 @@ export default class Alpine {
         'calamares-mod-grubcfg',
         'calamares-mod-hostinfo',
         'calamares-mod-hwclock',
-        'calamares-mod-interactiveterminal',
         'calamares-mod-keyboard',
         'calamares-mod-keyboardq',
         'calamares-mod-locale',
         'calamares-mod-localeq',
         'calamares-mod-luksbootkeyfile',
-        'calamares-mod-luksopenswaphookcfg',
+        'calamares-mod-luksopenswaphookcfg-',
         'calamares-mod-machineid',
         'calamares-mod-mkinitfs',
         'calamares-mod-mount',
+        'calamares-mod-netinstall',
         'calamares-mod-networkcfg',
+        'calamares-mod-notesqml',
+        'calamares-mod-oemid',
+        'calamares-mod-packagechooser',
         'calamares-mod-packages',
         'calamares-mod-partition',
-        'calamares-mod-plasmalnf',
         'calamares-mod-plymouthcfg',
+        'calamares-mod-preservefiles',
+        'calamares-mod-rawfs',
         'calamares-mod-removeuser',
         'calamares-mod-services-openrc',
         'calamares-mod-shellprocess',
@@ -48,9 +52,8 @@ export default class Alpine {
         'calamares-mod-umount',
         'calamares-mod-unpackfs',
         'calamares-mod-users',
-        'calamares-mod-webview',
         'calamares-mod-welcome',
-        'calamares-mod-welcomeq'
+        'calamares-mod-welcomeq',
     ];
     /**
      * Alpine: calamaresInstall
@@ -79,7 +82,9 @@ export default class Alpine {
      * calamaresPolicies
      */
     static async calamaresPolicies(verbose = false) {
-        // nothing
+        const echo = Utils.setEcho(verbose);
+        const policyFile = '/usr/share/polkit-1/actions/com.github.calamares.calamares.policy';
+        await exec(`sed -i 's/auth_admin/yes/' ${policyFile}`, echo);
     }
     /**
      * Alpine: calamaresRemove

package/dist/classes/pacman.d/opensuse.js

@@ -69,6 +69,7 @@ export default class Opensuse {
         let available = false;
         const cmd = `/usr/bin/zypper --not-installed-only ${packageName} | grep Package:`;
         const stdout = shx.exec(cmd, { silent: true }).stdout.trim();
+        // const stdout = (await exec(cmd, Utils.setEcho(false))).data.trim()
         if (stdout.includes(packageName)) {
             available = true;
         }
@@ -92,9 +93,9 @@ export default class Opensuse {
      */
     static packageIsInstalled(packageName) {
         let installed = false;
-        const cmd = `/usr/bin/zypper search --installed-only ${packageName}`;
-        const stdout = shx.exec(cmd, { silent: true }).stdout.trim();
-        if (stdout.includes(packageName)) {
+        const cmd = `rpm -q ${packageName}`;
+        const code = shx.exec(cmd, { silent: true }).code;
+        if (code === 0) {
             installed = true;
         }
         return installed;

package/dist/classes/pacman.js

@@ -60,10 +60,7 @@ export default class Pacman {
     static async calamaresInstall(verbose = false) {
         if (this.isInstalledGui()) {
             const familyId = this.distro().familyId;
-            if (familyId === 'aldos') {
-                await Aldos.calamaresInstall(verbose);
-            }
-            else if (familyId === 'alpine') {
+            if (familyId === 'alpine') {
                 await Alpine.calamaresInstall(verbose);
             }
             else if (familyId === 'archlinux') {
@@ -96,10 +93,7 @@ export default class Pacman {
      */
     static async calamaresPolicies(verbose = false) {
         const familyId = this.distro().familyId;
-        if (familyId === 'aldos') {
-            await Aldos.calamaresPolicies(verbose);
-        }
-        else if (familyId === 'alpine') {
+        if (familyId === 'alpine') {
             await Alpine.calamaresPolicies(verbose);
         }
         else if (familyId === 'archlinux') {
@@ -728,10 +722,7 @@ export default class Pacman {
     static packageIsInstalled(packageName) {
         let installed = false;
         const familyId = this.distro().familyId;
-        if (familyId === 'aldos') {
-            installed = Aldos.packageIsInstalled(packageName);
-        }
-        else if (familyId === 'alpine') {
+        if (familyId === 'alpine') {
             installed = Alpine.packageIsInstalled(packageName);
         }
         else if (familyId === 'archlinux') {

package/dist/classes/pxe.d.ts

@@ -5,7 +5,8 @@
  * email: piero.proietti@gmail.com
  * license: MIT
  */
-import { IDhcpOptions, ITftpOptions } from '../interfaces/i-pxe.js';
+import { IDhcpOptions, ITftpOptions } from '../dhcpd-proxy/interfaces/i-pxe.js';
+import Distro from './distro.js';
 import Settings from './settings.js';
 /**
  * Pxe:
@@ -18,6 +19,7 @@ export default class Pxe {
     isos: string[];
     nest: string;
     pxeRoot: string;
+    distro: Distro;
     settings: Settings;
     verbose: boolean;
     vmlinuz: string;
@@ -27,6 +29,12 @@ export default class Pxe {
      * @param pxeRoot
      */
     constructor(nest?: string, pxeRoot?: string);
+    /**
+     * fertilization()
+     *
+     * cuckoo's nest
+     */
+    fertilization(): Promise<void>;
     /**
      * build
      */
@@ -35,16 +43,9 @@ export default class Pxe {
      *
      * @param dhcpOptions
      */
-    dhcpStart(dhcpOptions: IDhcpOptions): void;
-    /**
-     * fertilization()
-     *
-     * cuckoo's nest
-     */
-    fertilization(): Promise<void>;
+    dhcpdStart(dhcpOptions: IDhcpOptions): void;
     /**
      * start http server for images
-     *
      */
     httpStart(): Promise<void>;
     /**
@@ -52,23 +53,25 @@ export default class Pxe {
      */
     tftpStart(tftpOptions: ITftpOptions): Promise<void>;
     /**
-     * Il resto PRIVATO
+     * configure PXE http server
      */
+    private http;
     /**
      * configure PXE bios
      */
     private bios;
     /**
-     * configure PXE http server
-     */
-    private http;
+    * uefi: uso ipxe solo per chainload di grub
+    */
+    private uefi;
     /**
-     *
+     * grubCfg
+     * @param familyId
      */
-    private ipxe;
+    private grubCfg;
     /**
-     *
-     * @param cmd
+     * Metodo helper per ottenere i parametri corretti per GRUB
+     * in base alla famiglia della distribuzione.
      */
-    private tryCatch;
+    private _getKernelParameters;
 }