penguins-eggs 25.8.28 → 25.9.2

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

@@ -17,7 +17,7 @@ const __dirname = path.dirname(new URL(import.meta.url).pathname);
  * initrdAlpine
  */
 export async function initrdAlpine() {
-    Utils.warning(`creating ${path.basename(this.initrd)} Alpine on ISO/live`);
+    Utils.warning(`creating ${path.basename(this.initrd)} Alpine on (ISO)/live`);
     let initrdImg = Utils.initrdImg();
     initrdImg = initrdImg.slice(Math.max(0, initrdImg.lastIndexOf('/') + 1));
     const pathConf = path.resolve(__dirname, `../../../mkinitfs/live.conf`);
@@ -27,7 +27,7 @@ export async function initrdAlpine() {
  * initrdArch
  */
 export async function initrdArch() {
-    Utils.warning(`creating ${path.basename(this.initrd)} using mkinitcpio on ISO/live`);
+    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';
@@ -64,7 +64,7 @@ export async function initrdArch() {
  * initrdDebian
  */
 export async function initrdDebian(verbose = false) {
-    Utils.warning(`creating ${this.initrd} using mkinitramfs on ISO/live`);
+    Utils.warning(`creating ${this.initrd} using mkinitramfs on (ISO)/live`);
     let isCrypted = false;
     if (fs.existsSync('/etc/crypttab')) {
         isCrypted = true;
@@ -79,7 +79,7 @@ export async function initrdDebian(verbose = false) {
 * initrdDracut) Almalinux/Fedora/Openmamba/Opensuse/Rocky/Voidlinux
 */
 export async function initrdDracut() {
-    Utils.warning(`creating ${path.basename(this.initrd)} using dracut on ISO/live`);
+    Utils.warning(`creating ${path.basename(this.initrd)} using dracut on (ISO)/live`);
     const prefix = this.settings.config.snapshot_prefix;
     const confdir = '--confdir ' + path.resolve(__dirname, `../../../dracut/dracut.conf.d`);
     // const dracutdir='--dracutdir /opt/penguins-eggs/dracut'

package/dist/classes/ovary.d/kernel-copy.js

@@ -17,6 +17,6 @@ const __dirname = path.dirname(new URL(import.meta.url).pathname);
    * kernelCopy
    */
 export async function kernelCopy() {
-    Utils.warning(`copying ${path.basename(this.vmlinuz)} on ISO/live`);
+    Utils.warning(`copying ${path.basename(this.vmlinuz)} on (ISO)/live`);
     await exec(`cp ${this.vmlinuz} ${this.settings.iso_work}live/`, this.echo);
 }

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

@@ -57,9 +57,9 @@ export async function makeEfi(theme = 'eggs') {
     const efiMemdiskDir = path.join(efiPath, '/memdisk/');
     const efiImgMnt = path.join(efiPath, 'mnt');
     const isoDir = this.settings.iso_work;
-    // create (iso)/boot/grub
+    // create (ISO)/boot/grub
     await exec(`mkdir ${isoDir}/boot/grub/${Utils.uefiFormat()} -p`, this.echo);
-    // create (iso)/EFI
+    // create (ISO)/EFI
     await exec(`mkdir ${isoDir}/EFI/boot -p`, this.echo);
     await exec(`cp ${shimEfi} ${isoDir}/EFI/boot/${bootEfiName()}`, this.echo);
     await exec(`cp ${grubEfi} ${isoDir}/EFI/boot/${grubEfiName()}`, this.echo);
@@ -91,9 +91,9 @@ export async function makeEfi(theme = 'eggs') {
     cfgSeekerUsbText += seeker;
     Utils.write(cfgSeekerUsb, cfgSeekerUsbText);
     /**
-     * create grub.cfg (bridge) on (iso)/boot/grub/x86_64-efi/grub.cfg
+     * create grub.cfg (bridge) on (ISO)/boot/grub/x86_64-efi/grub.cfg
      */
-    Utils.warning(`creating grub.cfg bridge to main. (iso)/boot/grub/${Utils.uefiFormat()}`);
+    Utils.warning(`creating grub.cfg bridge to main. (ISO)/boot/grub/${Utils.uefiFormat()}`);
     let cfgBridge = `${isoDir}/boot/grub/${Utils.uefiFormat()}/grub.cfg`;
     let cfgBridgeText = `# grub.cfg bridge\n`;
     cfgBridgeText += `# created on ${cfgBridge}\n`;
@@ -109,7 +109,7 @@ export async function makeEfi(theme = 'eggs') {
         pathBait = path.join(isoDir, '/EFI/ubuntu');
     }
     await exec(`mkdir ${pathBait} -p`, this.echo);
-    Utils.warning(`creating grub.cfg seeker ISO/DVD on (iso)/${pathBait}}`);
+    Utils.warning(`creating grub.cfg seeker ISO/DVD on (ISO)/EFI/${path.basename(pathBait)}`);
     let cfgBait = path.join(pathBait, '/grub.cfg');
     let cfgBaitText = '';
     cfgBaitText += `\n`;
@@ -166,12 +166,12 @@ export async function makeEfi(theme = 'eggs') {
     await exec(`umount ${efiImgMnt}`, this.echo);
     await new Promise(resolve => setTimeout(resolve, 500));
     // Copy isoImg in ${${isoDir}/boot/grub
-    Utils.warning("copyng efi.img on (iso)/boot/grub");
+    Utils.warning("copyng (efi.img) on (ISO)/boot/grub");
     await exec(`cp ${efiImg} ${isoDir}/boot/grub`, this.echo);
     /**
-     * creating grub.cfg (4) on (iso)/boot/grub
+     * creating grub.cfg (4) on (ISO)/boot/grub
      */
-    Utils.warning("creating grub.cfg main on (iso)/boot/grub");
+    Utils.warning("creating grub.cfg main on (ISO)/boot/grub");
     // copy splash to efiWorkDir
     const splashDest = `${efiWorkDir}/boot/grub/splash.png`;
     let splashSrc = path.resolve(__dirname, `../../../addons/${theme}/theme/livecd/splash.png`);

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

@@ -85,7 +85,7 @@ export async function makeSquashfs(scriptOnly = false, unsecure = false) {
     cmd = cmd.replaceAll(/\s\s+/g, ' ');
     Utils.writeX(`${this.settings.work_dir.ovarium}mksquashfs`, cmd);
     if (!scriptOnly) {
-        Utils.warning('creating filesystem.squashfs on ISO/live');
+        Utils.warning('creating filesystem.squashfs on (ISO)/live');
         // Utils.warning(`compression: ` + compression)
         const test = (await exec(cmd, Utils.setEcho(true))).code;
         if (test !== 0) {

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

@@ -248,8 +248,8 @@ export async function produce(kernel = '', clone = false, cryptedclone = false,
                 synctoCmd += ' --excludes'; // from Marco, usa home.list
             }
             await exec(synctoCmd, Utils.setEcho(true));
-            Utils.warning(`moving ${luksFile} in ${this.nest}iso/live`);
-            await exec(`mv ${luksFile} ${this.nest}iso/live`, this.echo);
+            Utils.warning(`moving ${luksFile} in ${this.nest}(ISO)/live`);
+            await exec(`mv ${luksFile} ${this.nest}(ISO)/live`, this.echo);
         }
         const mkIsofsCmd = (await this.xorrisoCommand(clone, cryptedclone)).replaceAll(/\s\s+/g, ' ');
         this.makeDotDisk(this.volid, mksquashfsCmd, mkIsofsCmd);

package/dist/classes/pxe.js

@@ -334,15 +334,7 @@ export default class Pxe {
                 ip=dhcp`;
                 break;
             case 'fedora':
-                lp = `initrd=http://${Utils.address()}/live/${path.basename(this.initrdImg)} \
-               root=live:http://${Utils.address()}/live/filesystem.squashfs \
-               rootfstype=auto \
-               ro \
-               rd.live.image \
-               rd.luks=0 \
-               rd.md=0 \
-               rd.dm=0\n`;
-                break;
+            case 'openmamba':
             case 'opensuse':
                 lp = `initrd=http://${Utils.address()}/live/${path.basename(this.initrdImg)} \
                root=live:http://${Utils.address()}/live/filesystem.squashfs \

package/dist/classes/utils.d/kernel.js

@@ -73,10 +73,11 @@ export default class Kernel {
             initramfs = `/boot/initramfs-${version}-x86_64.img`;
         }
         else {
-            // Gestione generica per le altre distro (Debian, Fedora, SUSE, ecc.)
+            // Gestione generica per le altre distro (Debian, Fedora, SUSE, OpenMamba, cc.)
             const candidates = [
                 `/boot/initrd.img-${kernel}`, // Debian, Ubuntu
                 `/boot/initramfs-${kernel}.img`, // Fedora, RHEL
+                `/boot/initramfs-${kernel}-1mamba-x86_64.img`, // Openmamba
                 `/boot/initrd-${kernel}`, // openSUSE
                 `/boot/initramfs-${kernel}`, // fallbacks
             ];

package/dist/classes/utils.js

@@ -80,13 +80,15 @@ export default class Utils {
         if (codenameId === 'rolling' || codenameId === '') {
             const releaseId = Utils.getOsRelease().VERSION_ID.trim();
             if (releaseId !== '') {
-                result += `${releaseId}-`;
+                result += releaseId;
             }
         }
         else {
-            result += `${codenameId.toLowerCase()}-`;
+            result += `${codenameId.toLowerCase()}`;
+        }
+        if (!result.endsWith('-')) {
+            result += '-';
         }
-        result = result.replace(`/`, '-');
         return result;
     }
     /**

package/dist/commands/export/pkg.js

@@ -121,7 +121,7 @@ export default class ExportPkg extends Command {
         }
         else if (familyId === 'openmamba') {
             Utils.warning("openmamba rpm packages");
-            localPath = `/usr/src/RPM/RPMS/x86_64`;
+            localPath = `/home/${this.user}/rpmbuild/RPMS/x86_64`;
             remotePath = this.Tu.config.remotePathPackages + "/openmamba";
             filter = `penguins-eggs-[0-9][0-9].@([0-9]|[0-1][0-9]).@([0-9]|[0-3][0-9])-*mamba.*.rpm`;
             /**

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

@@ -29,6 +29,9 @@ export default async function addUser(username = 'live', password = 'evolution',
     else if (this.distro.familyId === 'fedora') {
         cmd = `chroot ${this.installTarget} adduser ${username} --create-home --shell /bin/bash --comment "${fullusername},${roomNumber},${workPhone},${homePhone}" ${this.toNull}`;
     }
+    else if (this.distro.familyId === 'openmamba') {
+        cmd = `chroot ${this.installTarget} useradd ${username} --create-home --shell /bin/bash --comment "${fullusername},${roomNumber},${workPhone},${homePhone}" ${this.toNull}`;
+    }
     else if (this.distro.familyId === 'opensuse') {
         cmd = `chroot ${this.installTarget} useradd ${username} --create-home --shell /bin/bash --comment "${fullusername},${roomNumber},${workPhone},${homePhone}" ${this.toNull}`;
     }
@@ -39,6 +42,9 @@ export default async function addUser(username = 'live', password = 'evolution',
     if (this.distro.familyId === 'debian') {
         group = 'sudo';
     }
+    else if (this.distro.familyId === 'openmamba') {
+        group = 'sysadmin';
+    }
     cmd = `chroot ${this.installTarget} usermod -aG ${group} ${username} ${this.toNull}`;
     await exec(cmd, this.echo);
     // add autologin group in archlinux

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

@@ -21,7 +21,15 @@ export default async function bootloader() {
     /**
      * grub-install: added --force per fedora family
      */
-    let cmd = `chroot ${this.installTarget} ${grubName}-install ${this.partitions.installationDevice} ${grubForce} ${this.toNull}`;
+    // define grub-install --target=${target}
+    let target = `x86_64-efi`;
+    if (!this.efi) {
+        target = 'i386-pc';
+    }
+    if (process.arch === 'arm64') {
+        target = `arm64-efi`;
+    }
+    let cmd = `chroot ${this.installTarget} ${grubName}-install --target=${target} ${this.partitions.installationDevice} ${grubForce} ${this.toNull}`;
     await exec(cmd, this.echo);
     /**
      * grub-mkconfig

package/dist/krill/classes/sequence.js

@@ -140,7 +140,7 @@ export default class Sequence {
         this.devices.data = {};
         this.devices.swap = {};
         this.distro = new Distro();
-        this.efi = fs.existsSync('/sys/firmware/efi/efivars');
+        this.efi = fs.existsSync('/efivars');
         this.luksFile = `${this.distro.liveMediumPath}live/${this.luksName}`;
     }
     /**

package/package.json

@@ -2,7 +2,7 @@
   "name": "penguins-eggs",
   "shortName": "eggs",
   "description": "A remaster system tool, compatible with Arch, Debian, Devuan, Ubuntu and others",
-  "version": "25.8.28",
+  "version": "25.9.2",
   "author": "Piero Proietti",
   "bin": {
     "eggs": "./bin/run.js"
@@ -52,11 +52,11 @@
     "@types/ws": "^8.18.1",
     "chai": "^6.0.1",
     "eslint": "^9.34.0",
-    "eslint-config-oclif": "^6.0.98",
+    "eslint-config-oclif": "^6.0.101",
     "eslint-config-prettier": "^10.1.8",
     "glob": "^11.0.3",
-    "mocha": "^11.7.0",
-    "oclif": "^4.22.14",
+    "mocha": "^11.7.2",
+    "oclif": "^4.22.16",
     "perrisbrewery": "^10",
     "prettier": "^3.6.2",
     "shx": "^0.4.0",

package/perrisbrewery/template/dependencies-bionic.yaml

@@ -4,9 +4,10 @@
 # common dependencies 
 common:
   - coreutils 
-  - cryptsetup
+  - cryptsetup 
   - cryptsetup-initramfs
   - curl # wardrobe
+  - dbus-bin | uuidgen-runtime # uuid-runtime per devuan
   - dosfstools # eggs
   - dpkg-dev  # yolk
   - git # wardrobe
@@ -14,21 +15,40 @@ common:
   - live-boot # eggs
   - live-boot-doc # eggs
   - live-boot-initramfs-tools # eggs
+  - live-config-systemd | live-config-sysvinit 
   - live-tools # eggs
   - lvm2  # pvdisplay in krill
-  - nodejs (>= 16)
-  - live-boot # questo va reinstallato
+  - nodejs (>= 16) # bionic
   - parted 
-  - penguins-bootloaders-pc-amd64
   - rsync
   - squashfs-tools
   - sshfs # eggs
   - xorriso
 
+  # bootloaders common
+  - ipxe
+  - pxelinux
+
 # dependencies arch specific
+#  arm64: grub-efi-arm64-bin, ipxe, shim-signed, u-boot-tools, 
+#  amd64: grub-pc-bin, grub-efi-ia32-bin, grub-efi-amd64-bin, syslinux-common, ipxe, isolinux, pxelinux, shim-signed
+#  i386: grub-pc-bin, grub-efi-ia32-bin, syslinux-common, ipxe, isolinux, pxelinux
+
 arch:
   amd64:
   - grub-efi-amd64-bin
+  - isolinux
+  - shim-signed
+  - syslinux-common
+
+  i386:
+  - grub-pc-bin
+  - isolinux
+  - grub-efi-ia32-bin
+  - syslinux-common
 
   arm64:
-  - syslinux-efi
+  - grub-efi-arm64-bin
+  - shim-signed
+  - u-boot-tools
+

package/dist/penguins-eggs_25.8.28-1_amd64.deb.sha256

@@ -1 +0,0 @@
-05498508d7860a84a12a8c8c7aaa9680c6c6743d74b534b6069fafe6bfd46b6f  penguins-eggs_25.8.28-1_amd64.deb

package/dist/penguins-eggs_25.8.28-1_arm64.deb.sha256

@@ -1 +0,0 @@
-1934d71c93cb97c8d7a728e8ae8617594c9baab385fc371d3c420f3f47394005  penguins-eggs_25.8.28-1_arm64.deb

package/dist/penguins-eggs_25.8.28-1_i386.deb.sha256

@@ -1 +0,0 @@
-c34883fec332c18410b19e7d422b5ab7d9df7a6626a9d449d03a4d12b7c07427  penguins-eggs_25.8.28-1_i386.deb