penguins-eggs 10.0.21 → 10.0.22

package/conf/distros/noble/calamares/settings.yml

@@ -0,0 +1,87 @@
+ # Ubuntu 24.04 noble
+---
+modules-search: [ local ]
+
+instances:
+- id: before_bootloader_mkdirs
+  module: contextualprocess
+  config: before_bootloader_mkdirs_context.conf
+- id: before_bootloader
+  module: contextualprocess
+  config: before_bootloader_context.conf
+#- id: logs
+#  module: shellprocess
+#  config: shellprocess_logs.conf
+- id: bug-LP#1829805
+  module: shellprocess
+  config: shellprocess_bug-LP#1829805.conf
+- id: add386arch
+  module: shellprocess
+  config: shellprocess_add386arch.conf
+#- id: pkgselect_action
+#  module: contextualprocess
+#  config: pkgselect_context.conf
+#- id: pkgselect_snap_action
+#  module: contextualprocess
+#  config: pkgselect_snap_context.conf
+- id: oemprep
+  module: shellprocess
+  config: shellprocess_oemprep.conf
+- id: fixconkeys_part1
+  module: shellprocess
+  config: shellprocess_fixconkeys_part1.conf
+- id: fixconkeys_part2
+  module: shellprocess
+  config: shellprocess_fixconkeys_part2.conf
+
+sequence:
+- show:
+  - welcome
+  - locale
+  - keyboard
+  # pkgselect
+  - partition
+  {{createUsers}}users
+  - summary
+- exec:
+  - partition
+  - mount
+  - unpackfs
+  {{hasSystemd}}machineid
+  - fstab
+  - locale
+  - keyboard
+  - localecfg
+  - luksbootkeyfile
+  {{createUsers}}users
+  {{hasDisplaymanager}}displaymanager
+  - networkcfg
+  - hwclock
+  - contextualprocess@before_bootloader_mkdirs
+  - shellprocess@bug-LP#1829805
+  - initramfscfg
+  - initramfs
+  - grubcfg
+  - contextualprocess@before_bootloader
+  - bootloader
+  # automirror
+  - shellprocess@add386arch
+  - shellprocess@fixconkeys_part1
+  - shellprocess@fixconkeys_part2
+  - packages
+  - removeuser  
+  # contextualprocess@pkgselect_action
+  # contextualprocess@pkgselect_snap_action
+  # shellprocess@logs
+  - cleanup
+  - sources-yolk-undo
+  - umount
+- show:
+  - finished
+
+branding: {{branding}}
+prompt-install: true
+dont-chroot: false
+oem-setup: false
+disable-cancel: false
+disable-cancel-during-exec: false

package/dist/classes/distro.js

@@ -108,8 +108,9 @@ class Distro {
             this.familyId = 'alpine';
             this.distroLike = 'Alpine';
             this.codenameId = 'rolling'; // questo viene rimosso dal nome
-            this.codenameLikeId = 'alpine-rolling';
-            this.liveMediumPath = '/.modloop/'; // ? è il mount della root su cd di installatione
+            this.codenameLikeId = 'alpine'; // prende alpine come codebaneLikeId
+            this.liveMediumPath = '/mnt/'; // Qua è deciso da noi
+            //this.liveMediumPath = '/run/live/medium/'
             this.squashfs = `live/filesystem.squashfs`;
             this.syslinuxPath = '/usr/share/syslinux/'; //correct
             this.pxelinuxPath = this.syslinuxPath;
@@ -117,7 +118,7 @@ class Distro {
             this.memdiskPath = this.syslinuxPath;
             this.isolinuxPath = this.syslinuxPath;
             // At the moment
-            this.isCalamaresAvailable = false;
+            this.isCalamaresAvailable = true;
         }
         else if (this.distroId === 'Fedora') {
             this.familyId = 'fedora';

package/dist/classes/incubation/incubator.js

@@ -146,6 +146,15 @@ export default class Incubator {
                 await rolling.create();
                 break;
             }
+            /**
+             * Alpine
+             */
+            case 'alpine': {
+                // actually take Buster
+                const alpine = new Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.isClone, this.verbose);
+                await alpine.create();
+                break;
+            }
         }
         if (Pacman.calamaresExists()) {
             partitionCustomize();

package/dist/classes/ovary.js

@@ -198,14 +198,8 @@ export default class Ovary {
             ignore: false
         });
         const users = result.data.split('\n');
-        let cmdUserDel = `userdel`;
-        if (this.familyId === 'alpine') {
-            // On Alpine we have just deluser
-            cmdUserDel = "deluser";
-        }
         for (let i = 0; i < users.length - 1; i++) {
-            // cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} deluser ${users[i]}`, verbose))
-            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} ${cmdUserDel} ${users[i]}`, this.verbose));
+            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} deluser ${users[i]}`, this.verbose));
         }
     }
     /**
@@ -220,14 +214,8 @@ export default class Ovary {
         const cmds = [];
         cmds.push(await rexec('chroot ' + this.settings.work_dir.merged + ' rm /home/' + this.settings.config.user_opt + ' -rf', this.verbose));
         cmds.push(await rexec('chroot ' + this.settings.work_dir.merged + ' mkdir /home/' + this.settings.config.user_opt, this.verbose));
-        if (this.familyId === 'alpine') {
-            // Create user using adduser
-            cmds.push(await rexec('chroot ' + this.settings.work_dir.merged + ' adduser -D -h /home/' + this.settings.config.user_opt + ' -s /bin/bash ' + this.settings.config.user_opt, this.verbose));
-        }
-        else {
-            // Create user using useradd
-            cmds.push(await rexec('chroot ' + this.settings.work_dir.merged + ' useradd ' + this.settings.config.user_opt + ' --home-dir /home/' + this.settings.config.user_opt + ' --shell /bin/bash ', this.verbose));
-        }
+        // Create user using useradd
+        cmds.push(await rexec('chroot ' + this.settings.work_dir.merged + ' useradd ' + this.settings.config.user_opt + ' --home-dir /home/' + this.settings.config.user_opt + ' --shell /bin/bash ', this.verbose));
         // live password
         cmds.push(await rexec('chroot ' + this.settings.work_dir.merged + ' echo ' + this.settings.config.user_opt + ':' + this.settings.config.user_opt_passwd + ' | chroot ' + this.settings.work_dir.merged + ' chpasswd', this.verbose));
         // root password
@@ -238,6 +226,14 @@ export default class Ovary {
         if (this.familyId === 'debian') {
             cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG sudo ${this.settings.config.user_opt}`, this.verbose));
         }
+        else if (this.familyId === '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));
+        }
         else if (this.familyId === 'archlinux') {
             cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} gpasswd -a ${this.settings.config.user_opt} wheel`, this.verbose));
             // check or create group: autologin
@@ -715,15 +711,20 @@ export default class Ovary {
         // mkinitfs
         const pathConf = path.resolve(__dirname, `../../mkinitfs/live.conf`);
         await exec(`mkinitfs -c ${pathConf} -o ${this.settings.iso_work}live/${initrdImg}`, Utils.setEcho(true));
-        const sidecar = path.resolve(__dirname, `../../mkinitfs/sidecar.sh`);
-        await exec(`cp ${sidecar} ${this.settings.iso_work}live/`);
+        const sidecars = path.resolve(__dirname, `../../mkinitfs/*.sh`);
+        await exec(`cp ${sidecars} ${this.settings.iso_work}live/`);
     }
     /**
      * initrdFedora()
      */
     async initrdFedora() {
         Utils.warning(`creating ${path.basename(this.settings.initrdImg)} Fedora on ISO/live`);
-        await exec(`cp /boot/initramfs-*.img ${this.settings.iso_work}/live/`, this.echo);
+        // dracut
+        const kernelVersion = shx.exec('uname -r', { silent: true }).stdout.trim();
+        const initrdImg = `initramfs-${kernelVersion}`;
+        const pathConf = path.resolve(__dirname, `../../dracut/dracut.conf.d`);
+        await exec(`dracut --confdir ${pathConf} ${this.settings.iso_work}live/${initrdImg}`, Utils.setEcho(true));
+        //await exec(`cp /boot/initramfs-*.img ${this.settings.iso_work}/live/`, this.echo)
     }
     /**
      * initrdSuse()

package/dist/classes/pacman.js

@@ -406,8 +406,8 @@ export default class Pacman {
         }
         else if (this.distro().codenameLikeId === 'noble') {
             const dest = '/etc/penguins-eggs.d/distros/noble';
-            const focal = `${rootPen}/conf/distros/focal/*`;
-            await exec(`cp -r ${focal} ${dest}`, echo);
+            const noble = `${rootPen}/conf/distros/noble/*`;
+            await exec(`cp -r ${noble} ${dest}`, echo);
             await exec(`cp -r ${buster}/calamares/calamares-modules/cleanup ${dest}/calamares/calamares-modules/cleanup`, echo);
             await exec(`cp -r ${buster}/calamares/calamares-modules/sources-yolk ${dest}/calamares/calamares-modules/sources-yolk`, echo);
             await exec(`cp -r ${buster}/calamares/calamares-modules/sources-yolk-undo ${dest}/calamares/calamares-modules/sources-yolk-undo`, echo);
@@ -457,10 +457,10 @@ export default class Pacman {
              * Alpine
              **********************************************************************************/
         }
-        else if (this.distro().codenameLikeId === 'alpine-rolling') {
-            const dest = '/etc/penguins-eggs.d/distros/alpine-rolling/';
-            const alpine = `${rootPen}/conf/distros/alpine-rolling/*`;
-            await exec(`cp -r ${alpine} ${dest}`, echo);
+        else if (this.distro().codenameLikeId === 'alpine') {
+            // Prende tutto da buster
+            const dest = '/etc/penguins-eggs.d/distros/alpine/';
+            await exec(`cp -r ${buster}/calamares ${dest}/calamares`, echo);
         }
     }
     /**
@@ -528,8 +528,10 @@ export default class Pacman {
                 installed = true;
             }
         }
-        else if (this.distro().familyId === 'alpine' && Alpine.packageIsInstalled('xorg-x11-server')) {
-            installed = true;
+        else if (this.distro().familyId === 'alpine') {
+            if (Alpine.packageIsInstalled('xorg-server')) {
+                installed = true;
+            }
         }
         return installed;
     }
@@ -688,7 +690,7 @@ export default class Pacman {
             }
         }
         else if (this.distro().familyId === 'alpine') {
-            grubInstalled = 'grub2';
+            grubInstalled = 'grub';
         }
         return grubInstalled;
     }

package/dist/classes/utils.d.ts

@@ -44,6 +44,7 @@ export default class Utils {
      * @returns
      */
     static isSysvinit(): boolean;
+    static isOpenRc(): boolean;
     /**
      * ricava path per vmlinuz
      * Normalmente cerca BOOT_IMAGE

package/dist/classes/utils.js

@@ -14,8 +14,6 @@ import inquirer from 'inquirer';
 import chalk from 'chalk';
 import { spawnSync } from 'child_process';
 import { Netmask } from 'netmask';
-// libraries
-import { exec } from '../lib/utils.js';
 import Distro from './distro.js';
 // pjson
 import { createRequire } from 'module';
@@ -99,6 +97,14 @@ export default class Utils {
         shx.exec(`rm ${checkFile}`);
         return isSysvinit;
     }
+    static isOpenRc() {
+        let isOpenRc = false;
+        let distro = new Distro();
+        if (distro.familyId === "alpine") {
+            isOpenRc = true;
+        }
+        return isOpenRc;
+    }
     /**
      * ricava path per vmlinuz
      * Normalmente cerca BOOT_IMAGE
@@ -229,13 +235,43 @@ export default class Utils {
      * Return the primary user's name
      */
     static async getPrimaryUser() {
-        let primaryUser = (await exec('/usr/bin/logname 2>/dev/null || echo ${SUDO_USER:-${USER}}', { echo: false, ignore: false, capture: true })).data.trim();
-        // if logname don't work seem we get '' so:
+        const { execSync } = require('child_process');
+        let primaryUser = '';
+        try {
+            // Attempt to get the user from logname
+            primaryUser = execSync('/usr/bin/logname 2>/dev/null', { encoding: 'utf-8' }).trim();
+        }
+        catch (error) {
+            // logname failed, so we continue with other methods
+        }
+        if (primaryUser === 'root') {
+            primaryUser = '';
+        }
+        if (primaryUser === '') {
+            try {
+                // Check if doas is installed and get the DOAS_USER
+                execSync('command -v doas', { stdio: 'ignore' });
+                primaryUser = execSync('echo $DOAS_USER', { encoding: 'utf-8' }).trim();
+            }
+            catch (error) {
+                // doas is not installed or DOAS_USER is not set, continue with the next method
+            }
+        }
+        if (primaryUser === '') {
+            try {
+                // Check for the SUDO_USER
+                primaryUser = execSync('echo $SUDO_USER', { encoding: 'utf-8' }).trim();
+            }
+            catch (error) {
+                // SUDO_USER is not set, continue with the next method
+            }
+        }
         if (primaryUser === '') {
-            primaryUser = shx.exec('echo $SUDO_USER', { silent: true }).stdout.trim();
+            // Fallback to the USER environment variable
+            primaryUser = process.env.USER || '';
         }
         if (primaryUser === '') {
-            console.log(`Cannot find your user name...`);
+            console.error('Cannot determine the primary user.');
             process.exit(1);
         }
         return primaryUser;
@@ -568,7 +604,8 @@ export default class Utils {
             '/lib/live/mount/rootfs/filesystem.squashfs', // ubuntu bionic
             '/live/aufs', // mx-linux
             '/run/miso/sfs/livefs', // ManjaroLinux
-            '/run/archiso/airootfs' // Arch
+            '/run/archiso/airootfs', // Arch
+            '/media/root-rw' // AlpineLinux
         ];
         for (let i = 0; i < paths.length; i++) {
             if (Utils.isMountpoint(paths[i])) {

package/dist/classes/xdg.js

@@ -51,8 +51,6 @@ export default class Xdg {
                 const regexDefaultUser = new RegExp(`default_user\\s*${olduser}`, 'g');
                 content = content.replace(regexDefaultUser, `default_user ${newuser}`);
                 fs.writeFileSync(`${chroot}/etc/${slimConf}`, content, 'utf8');
-                // shx.sed('-i', 'auto_login no', 'auto_login yes', `${chroot}/etc/${slimConf}`)
-                // shx.sed('-i', `default_user ${olduser}`, `default_user ${newuser}`, `${chroot}/etc/${slimConf}`)
             }
             /**
              * LIGHTDM
@@ -69,7 +67,6 @@ export default class Xdg {
                             const regex = new RegExp(`autologin-user\\s*=\\s*${olduser}`, 'g'); // remove spaces
                             content = content.replace(regex, `autologin-user=${newuser}`);
                             fs.writeFileSync(curFile, content, 'utf8');
-                            // shx.sed('-i', `autologin-user=${olduser}`, `autologin-user=${newuser}`, curFile)
                         }
                     }
                 }

package/dist/components/information.js

@@ -94,8 +94,11 @@ export default async function information(verbose = false) {
         }
         initType = 'systemd';
     }
-    const sysvinit = Utils.isSysvinit();
-    const systemd = Utils.isSystemd();
+    if (initType === 'sysvinit') {
+        if (Utils.isOpenRc()) {
+            initType = 'openrc';
+        }
+    }
     const Checks = () => (React.createElement(Box, { borderStyle: "round", marginRight: 2, flexDirection: "row" },
         React.createElement(Box, { marginRight: 2 },
             React.createElement(Text, null,

package/dist/krill/modules/machine-id.js

@@ -8,6 +8,7 @@
  */
 import fs from 'node:fs';
 import { exec } from '../../lib/utils.js';
+import Distro from '../../classes/distro.js';
 /**
  * On Ubuntu
  * /etc/machine-id must exist to be re-created
@@ -18,5 +19,12 @@ export default async function machineId() {
     if (fs.existsSync(file)) {
         await exec(`rm ${file}`, this.echo);
     }
-    await exec(`touch ${file}`);
+    const distro = new Distro();
+    if (distro.familyId === "alpine") {
+        await exec(`dbus-uuidgen > ${this.installTarget}/var/lib/dbus/machine-id`);
+        await exec(`cp ${this.installTarget}/var/lib/dbus/machine-id ${this.installTarget}/etc/machine-id`);
+    }
+    else {
+        await exec(`touch ${file}`);
+    }
 }

package/dist/krill/sequence.js

@@ -353,15 +353,17 @@ export default class Sequence {
              * - autologin
              */
             if (!this.is_clone) {
-                // locale
-                message = "Locale";
-                percent = 0.70;
-                try {
-                    redraw(React.createElement(Install, { message: message, percent: percent }));
-                    await this.locale();
-                }
-                catch (error) {
-                    await Utils.pressKeyToExit(JSON.stringify(error));
+                if (this.distro.familyId !== 'alpine') {
+                    // locale
+                    message = "Locale";
+                    percent = 0.70;
+                    try {
+                        redraw(React.createElement(Install, { message: message, percent: percent }));
+                        await this.locale();
+                    }
+                    catch (error) {
+                        await Utils.pressKeyToExit(JSON.stringify(error));
+                    }
                 }
                 // keyboard
                 message = "settings keyboard";
@@ -373,14 +375,16 @@ export default class Sequence {
                     await Utils.pressKeyToExit(JSON.stringify(error));
                 }
                 // localeCfg
-                message = "Locale Configuration";
-                percent = 0.72;
-                try {
-                    await this.localeCfg();
-                    await exec("chroot " + this.installTarget + " locale-gen");
-                }
-                catch (error) {
-                    await Utils.pressKeyToExit(JSON.stringify(error));
+                if (this.distro.familyId !== 'alpine') {
+                    message = "Locale Configuration";
+                    percent = 0.72;
+                    try {
+                        await this.localeCfg();
+                        await exec("chroot " + this.installTarget + " locale-gen");
+                    }
+                    catch (error) {
+                        await Utils.pressKeyToExit(JSON.stringify(error));
+                    }
                 }
                 // delLiveUser
                 message = "Remove user LIVE";