penguins-eggs 10.0.49 → 10.0.52

package/dist/classes/utils.js

@@ -67,7 +67,11 @@ export default class Utils {
         let result = '';
         if (codenameId === 'rolling' || codenameId === '') {
             result = 'egg-of_' + distroId.toLowerCase() + '-';
-            if (distroId === 'Alpine' || distroId === 'Fedora') {
+            if (distroId === 'ALDOS' ||
+                distroId === 'AlmaLinux' ||
+                distroId === 'Alpine' ||
+                distroId === 'Fedora' ||
+                distroId === 'RockyLinux') {
                 const releaseId = shx.exec('lsb_release -rs', { silent: true }).stdout.toString().trim();
                 result = 'egg-of_' + distroId.toLowerCase() + '-' + releaseId.trim() + '-';
             }
@@ -219,6 +223,16 @@ export default class Utils {
             version = vmlinuz.substring(vmlinuz.indexOf('-') + 1);
             suffix = '.img';
         }
+        else if (distro.familyId === 'openmamba') {
+            initrd = 'initramfs';
+            separator = '-';
+            version = vmlinuz.substring(vmlinuz.indexOf('-') + 1);
+        }
+        else if (distro.familyId === 'aldos') {
+            initrd = 'initramfs';
+            separator = '-';
+            version = vmlinuz.substring(vmlinuz.indexOf('-') + 1);
+        }
         else if (distro.familyId === 'opensuse') {
             initrd = 'initrd';
             separator = '-';

package/dist/classes/xdg.js

@@ -61,7 +61,6 @@ export default class Xdg {
                 for (const elem of files) {
                     const curFile = dc + elem;
                     if (!fs.statSync(`/${curFile}`).isDirectory()) {
-                        //if (!N8.isDirectory(curFile)) {
                         let content = fs.readFileSync(curFile, 'utf8');
                         const find = '[Seat:*]';
                         if (content.includes(find)) {
@@ -72,6 +71,15 @@ export default class Xdg {
                     }
                 }
             }
+            else if (Pacman.packageIsInstalled('lxdm')) {
+                let lxdmConf = '/etc/lxdm/lxdm.conf';
+                if (fs.existsSync(lxdmConf)) {
+                    let content = fs.readFileSync(lxdmConf, 'utf8');
+                    const regex = new RegExp(`autologin\\s*=\\s*${olduser}`, 'g'); // remove spaces            
+                    content = content.replace(regex, `autologin=${newuser}`);
+                    fs.writeFileSync(lxdmConf, content, 'utf8');
+                }
+            }
             else if (Pacman.packageIsInstalled('sddm')) {
                 /**
                  * SDDM

package/dist/krill/modules/bootloader.js

@@ -15,6 +15,20 @@ import path from 'node:path';
  * @param this
  */
 export default async function bootloader() {
+    /**
+     * look at: https://systemd.io/BOOT/
+     */
+    // update boot/loader/entries/
+    const pathEntries = path.join(this.installTarget, '/boot/loader/entries/');
+    if (fs.existsSync(pathEntries)) {
+        const uuid = Utils.uuid(this.devices.root.name);
+        const machineId = fs.readFileSync(path.join(this.installTarget, '/etc/machine-id'), 'utf-8').trim();
+        await renameLoaderEntries(pathEntries, machineId);
+        await updateLoaderEntries(pathEntries, machineId, uuid);
+    }
+    /**
+     * GRUB
+     */
     let grubInstall = 'grub-install';
     if (this.distro.familyId === 'fedora' || this.distro.familyId === 'opensuse') {
         grubInstall = 'grub2-install';
@@ -36,14 +50,6 @@ export default async function bootloader() {
     catch {
         await Utils.pressKeyToExit(cmd);
     }
-    // update boot/loader/entries/
-    const pathEntries = path.join(this.installTarget, '/boot/loader/entries/');
-    if (fs.existsSync(pathEntries)) {
-        const uuid = Utils.uuid(this.devices.root.name);
-        const machineId = fs.readFileSync(path.join(this.installTarget, '/etc/machine-id'), 'utf-8').trim();
-        await renameLoaderEntries(pathEntries, machineId);
-        await updateLoaderEntries(pathEntries, uuid);
-    }
 }
 /**
  *
@@ -54,11 +60,19 @@ async function renameLoaderEntries(directoryPath, machineId) {
     const files = fs.readdirSync(directoryPath);
     if (files.length > 0) {
         for (const file of files) {
-            const oldPath = path.join(directoryPath, file);
-            let current = file.substring(32);
-            current = machineId + current;
-            const newPath = path.join(directoryPath, current);
-            await exec(`mv ${oldPath} ${newPath}`);
+            if (file.length > 32) {
+                const oldEntry = path.join(directoryPath, file);
+                let current = file.substring(32);
+                current = machineId + current;
+                const newEntry = path.join(directoryPath, current);
+                const cmd = `mv ${oldEntry} ${newEntry}`;
+                try {
+                    await exec(cmd);
+                }
+                catch (error) {
+                    console.log(`error executing: ${cmd}`);
+                }
+            }
         }
     }
 }
@@ -67,27 +81,46 @@ async function renameLoaderEntries(directoryPath, machineId) {
  * @param directoryPath
  * @param newUUID
  */
-async function updateLoaderEntries(directoryPath, newUUID) {
+async function updateLoaderEntries(directoryPath, machineId, newUUID) {
     const files = fs.readdirSync(directoryPath);
     if (files.length > 0) {
         for (const file of files) {
-            console.log(file);
             const filePath = path.join(directoryPath, file);
-            console.log(`entry: ${filePath}`);
             let source = fs.readFileSync(filePath, 'utf8');
             let lines = source.split('\n');
             let content = '';
             for (let line of lines) {
-                if (line.includes('UUID=')) {
-                    const at = line.indexOf('UUID=');
-                    const p1 = line.substring(0, at + 5);
-                    const p2 = newUUID;
-                    const p3 = line.substring(at + 5 + 36);
-                    console.log("Orig: " + line);
-                    console.log("p1: " + p1);
-                    console.log("p2: " + p2);
-                    console.log("p3: " + p3);
-                    line = p1 + p2 + p3;
+                /**
+                 * REPLACE root=UUID=
+                 */
+                if (line.includes('root=UUID=')) {
+                    const at = line.indexOf('root=UUID=');
+                    const start = line.substring(0, at + 10);
+                    const stop = line.substring(at + 10 + 36);
+                    line = start + newUUID + stop;
+                }
+                /**
+                 * REMOVE resume=UUID=
+                 */
+                if (line.includes('resume=UUID=')) {
+                    const at = line.indexOf('resume=UUID=');
+                    const start = line.substring(0, at - 1);
+                    line = start;
+                }
+                /**
+                 * REPLACE machineId
+                 */
+                // version 0-rescue-
+                if (line.includes('version 0-rescue-')) {
+                    line = `version 0-rescue-${machineId}`;
+                }
+                // linux /boot/vmlinuz-0-rescue-
+                if (line.includes('vmlinuz-0-rescue-')) {
+                    line = `vmlinuz-0-rescue-${machineId}`;
+                }
+                // initrd /boot/initramfs-0-rescue-
+                if (line.includes('initrd /boot/initramfs-0-rescue-')) {
+                    line = `initrd /boot/initramfs-0-rescue-${machineId}.img`;
                 }
                 content += line + '\n';
             }

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

@@ -8,6 +8,7 @@
  */
 import fs from 'node:fs';
 import { exec } from '../../lib/utils.js';
+import Utils from '../../classes/utils.js';
 /**
  * On Ubuntu
  * /etc/machine-id must exist to be re-created
@@ -20,17 +21,13 @@ export default async function machineId() {
         await exec(`rm ${file} ${this.toNull}`, this.echo);
     }
     /**
-     * machine/id always new now
+     * machine/id ALWAYS new
      */
-    await exec(`dbus-uuidgen --ensure=${this.installTarget}/var/lib/dbus/machine-id ${this.toNull}`);
-    await exec(`cp ${this.installTarget}/var/lib/dbus/machine-id ${this.installTarget}/etc/machine-id`);
-    /*
-    // On Alpine, we need to create the machine-id file
-    if (this.distro.familyId === 'alpine') {
-      await exec(`dbus-uuidgen --ensure=${this.installTarget}/var/lib/dbus/machine-id ${this.toNull}`)
-      await exec(`cp ${this.installTarget}/var/lib/dbus/machine-id ${this.installTarget}/etc/machine-id`)
-    } else {
-      await exec(`touch ${file} ${this.toNull}`)
+    if (Utils.isSystemd()) {
+        await exec(`chroot ${this.installTarget} systemd-machine-id-setup`);
+    }
+    else {
+        await exec(`chroot ${this.installTarget} dbus-uuidgen --ensure=/var/lib/dbus/machine-id ${this.toNull}`);
+        await exec(`chroot ${this.installTarget} cp /var/lib/dbus/machine-id /etc/machine-id`);
     }
-    */
 }

package/dist/krill/sequence.js

@@ -617,11 +617,7 @@ export default class Sequence {
             await redraw(React.createElement(React.Fragment, null,
                 React.createElement(Title, null),
                 React.createElement(Box, null,
-                    React.createElement(Text, null, message)),
-                React.createElement(Box, null,
-                    React.createElement(Text, null,
-                        "Error: ",
-                        currErr))));
+                    React.createElement(Text, null, message))));
             cliCursor.show();
             await exec("/bin/bash");
             cliCursor.hide();