penguins-eggs 9.3.4 → 9.3.8

package/dist/classes/incubation/distros/focal.js

@@ -19,7 +19,7 @@ class Focal {
      * @param displaymanager
      * @param verbose
      */
-    constructor(installer, remix, distro, user_opt, release = false, verbose = false) {
+    constructor(installer, remix, distro, user_opt, release = false, theme = 'eggs', verbose = false) {
         this.verbose = false;
         this.installer = {};
         this.release = false;
@@ -29,26 +29,25 @@ class Focal {
         this.user_opt = user_opt;
         this.verbose = verbose;
         this.release = release;
+        this.theme = theme;
     }
     /**
-     *
+     * locale, partitions, users can come from themes
      */
     async create() {
         const fisherman = new fisherman_1.default(this.distro, this.installer, this.verbose);
-        // console.log('creating settings: ' + this.remix.branding)
         await fisherman.settings(this.remix.branding);
-        // console.log('creating modules: ' + this.remix.branding)
-        await fisherman.buildModule('partition', this.remix.branding);
+        await fisherman.buildModule('partition', this.theme);
         await fisherman.buildModule('mount');
         await fisherman.moduleUnpackfs();
         await fisherman.buildCalamaresModule('sources-yolk', true);
         await fisherman.buildModule('machineid');
         await fisherman.buildModule('fstab');
-        await fisherman.buildModule('locale');
+        await fisherman.buildModule('locale', this.theme);
         await fisherman.buildModule('keyboard');
         await fisherman.buildModule('localecfg');
         await fisherman.buildModule('luksbootkeyfile');
-        await fisherman.buildModule('users');
+        await fisherman.buildModule('users', this.theme);
         await fisherman.moduleDisplaymanager();
         await fisherman.buildModule('networkcfg');
         await fisherman.buildModule('hwclock');

package/dist/classes/incubation/distros/jessie.js

@@ -33,7 +33,7 @@ class Jessie {
         this.release = release; // nel senso di --final 
     }
     /**
-     *
+     * partitions can come from themes
      */
     async create() {
         const fisherman = new fisherman_1.default(this.distro, this.installer, this.verbose);

package/dist/classes/incubation/distros/rolling.js

@@ -33,7 +33,7 @@ class Rolling {
         this.release = release;
     }
     /**
-     *
+     * locale, partitions, users can come from themes
      */
     async create() {
         const fisherman = new fisherman_1.default(this.distro, this.installer, this.verbose);
@@ -44,10 +44,10 @@ class Rolling {
         // await fisherman.buildCalamaresModule('sources-yolk', true)
         // await fisherman.buildModule('machineid')
         await fisherman.buildModule('fstab');
-        await fisherman.buildModule('locale');
+        await fisherman.buildModule('locale', this.remix.branding);
         await fisherman.buildModule('keyboard');
         await fisherman.buildModule('localecfg');
-        await fisherman.buildModule('users');
+        await fisherman.buildModule('users', this.remix.branding);
         await fisherman.moduleDisplaymanager();
         await fisherman.buildModule('networkcfg');
         await fisherman.buildModule('hwclock');

package/dist/classes/incubation/fisherman-helper/packages.js

@@ -18,7 +18,7 @@ function remove(distro) {
     }
     let yaml = '';
     for (const elem of packages) {
-        yaml += `    - ${elem.trim()}\n`;
+        yaml += `  - ${elem.trim()}\n`;
     }
     if (yaml !== '') {
         yaml = '- remove:\n' + yaml;
@@ -37,27 +37,27 @@ function tryInstall(distro) {
      * Depending on the distro
      */
     if (distro.distroLike === 'Ubuntu') {
-        yaml += '    - language-pack-$LOCALE\n';
+        yaml += '  - language-pack-$LOCALE\n';
     }
     // Da localizzare se presenti
     if (pacman_1.default.packageIsInstalled('hunspell')) {
-        yaml += '    - hunspell-$LOCALE\n';
+        yaml += '  - hunspell-$LOCALE\n';
     }
     if (pacman_1.default.packageIsInstalled('libreoffice-base-core')) {
-        yaml += `    - libreoffice-l10n-$LOCALE\n`;
-        yaml += `    - libreoffice-help-$LOCALE\n`;
+        yaml += `  - libreoffice-l10n-$LOCALE\n`;
+        yaml += `  - libreoffice-help-$LOCALE\n`;
     }
     if (pacman_1.default.packageIsInstalled('firefox-esr')) {
-        yaml += `    - firefox-esr-$LOCALE\n`;
+        yaml += `  - firefox-esr-$LOCALE\n`;
     }
     if (pacman_1.default.packageIsInstalled('firefox')) {
-        yaml += `    - firefox-$LOCALE\n`;
+        yaml += `  - firefox-$LOCALE\n`;
     }
     if (pacman_1.default.packageIsInstalled('thunderbird')) {
-        yaml += `    - thunderbird-locale-$LOCALE\n`;
+        yaml += `  - thunderbird-locale-$LOCALE\n`;
     }
     if (yaml !== '') {
-        yaml = '  - try_install:\n' + yaml;
+        yaml = '- try_install:\n' + yaml;
     }
     return yaml;
 }

package/dist/classes/incubation/fisherman.js

@@ -25,7 +25,13 @@ class Fisherman {
     /**
      * write setting
      */
-    async settings(branding = 'eggs') {
+    async settings(vendor = 'eggs') {
+        let branding = vendor;
+        if (vendor !== 'eggs') {
+            if (vendor.includes('/')) {
+                branding = vendor.substring(vendor.lastIndexOf('/'));
+            }
+        }
         const settings = this.installer.configuration + 'settings.conf';
         shelljs_1.default.cp(this.installer.template + 'settings.yml', settings);
         let hasSystemd = '# ';
@@ -37,7 +43,7 @@ class Fisherman {
          */
         let filePersonal = `/home/eggs/ovarium/iso/live/is-clone.md`;
         if (utils_1.default.isLive()) {
-            filePersonal = node_path_1.default.dirname(this.distro.mountpointSquashFs) + `/is-clone.md`;
+            filePersonal = node_path_1.default.dirname(this.distro.liveMediumPath) + `/is-clone.md`;
         }
         let hasDisplaymanager = '# ';
         let createUsers = '# ';
@@ -109,7 +115,10 @@ class Fisherman {
          *
          */
         if (vendor !== '') {
-            const customModuleSource = node_path_1.default.resolve(__dirname, `../../../addons/${vendor}/theme/calamares/modules/${name}.yml`);
+            let customModuleSource = node_path_1.default.resolve(__dirname, `../../../addons/${vendor}/theme/calamares/modules/${name}.yml`);
+            if (vendor.includes('/')) {
+                customModuleSource = `${vendor}/theme/calamares/modules/${name}.yml`;
+            }
             if (node_fs_1.default.existsSync(customModuleSource)) {
                 moduleSource = customModuleSource;
             }
@@ -213,7 +222,7 @@ class Fisherman {
     async moduleUnpackfs() {
         const name = 'unpackfs';
         this.buildModule(name);
-        shelljs_1.default.sed('-i', '{{source}}', this.distro.mountpointSquashFs, this.installer.modules + name + '.conf');
+        shelljs_1.default.sed('-i', '{{source}}', this.distro.liveMediumPath + this.distro.squashfs, this.installer.modules + name + '.conf');
     }
     /**
      * usa i moduli-ts

package/dist/classes/incubation/incubator.js

@@ -28,16 +28,18 @@ class Incubator {
      * @param distro
      * @param verbose
      */
-    constructor(remix, distro, user_opt = 'live', verbose = false) {
+    constructor(remix, distro, user_opt = 'live', theme = 'eggs', verbose = false) {
         this.verbose = false;
         this.installer = {};
         this.installer = (0, installer_1.installer)();
         this.remix = remix;
         this.distro = distro;
         this.user_opt = user_opt;
+        this.theme = theme;
         this.verbose = verbose;
-        if (remix.branding === undefined) {
-            remix.branding = 'eggs';
+        this.remix.branding = theme;
+        if (theme.includes('/')) {
+            this.remix.branding = theme.substring(theme.lastIndexOf('/') + 1);
         }
     }
     /**
@@ -60,17 +62,17 @@ class Incubator {
                 break;
             }
             case 'buster': {
-                const buster = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
+                const buster = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.verbose);
                 await buster.create();
                 break;
             }
             case 'bullseye': {
-                const bullseye = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
+                const bullseye = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.verbose);
                 await bullseye.create();
                 break;
             }
             case 'bookworm': {
-                const bookworm = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
+                const bookworm = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.verbose);
                 await bookworm.create();
                 // DEVUAN
                 break;
@@ -79,17 +81,17 @@ class Incubator {
              * DEVUAN
              */
             case 'beowulf': {
-                const beowulf = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
+                const beowulf = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.verbose);
                 await beowulf.create();
                 break;
             }
             case 'chimaera': {
-                const chimaera = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
+                const chimaera = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.verbose);
                 await chimaera.create();
                 break;
             }
             case 'daedalus': {
-                const daedalus = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
+                const daedalus = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.verbose);
                 await daedalus.create();
                 break;
             }
@@ -102,17 +104,17 @@ class Incubator {
                 break;
             }
             case 'focal': {
-                const focal = new focal_1.Focal(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
+                const focal = new focal_1.Focal(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.verbose);
                 await focal.create();
                 break;
             }
             case 'jammy': {
-                const jammy = new focal_1.Focal(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
+                const jammy = new focal_1.Focal(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.verbose);
                 await jammy.create();
                 break;
             }
             case 'kinetic': {
-                const kinetic = new focal_1.Focal(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
+                const kinetic = new focal_1.Focal(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.verbose);
                 await kinetic.create();
                 break;
             }
@@ -200,7 +202,11 @@ class Incubator {
          * ADDONS (only for calamares)
          */
         if (this.installer.name === 'calamares') {
-            const calamaresBranding = node_path_1.default.resolve(__dirname, `../../../addons/${this.remix.branding}/theme/calamares/branding`);
+            // console.log('theme: ' + this.theme)
+            let calamaresBranding = node_path_1.default.resolve(__dirname, `../../../addons/${this.remix.branding}/theme/calamares/branding`);
+            if (this.theme.includes('/')) {
+                calamaresBranding = `${this.theme}/theme/calamares/branding`;
+            }
             if (node_fs_1.default.existsSync(calamaresBranding)) {
                 if (!node_fs_1.default.existsSync(this.installer.configuration + `branding/${this.remix.branding}`)) {
                     try {
@@ -213,23 +219,29 @@ class Incubator {
                 shelljs_1.default.cp(calamaresBranding + '/*', this.installer.configuration + `branding/${this.remix.branding}/`);
             }
             else {
-                console.log(`${calamaresBranding} not found!`);
+                console.log(`${calamaresBranding} branding not found!`);
                 process.exit();
             }
-            const calamaresIcon = node_path_1.default.resolve(__dirname, `../../../addons/${this.remix.branding}/theme/artwork/install-debian.png`);
+            let calamaresIcon = node_path_1.default.resolve(__dirname, `../../../addons/${this.remix.branding}/theme/artwork/install-debian.png`);
+            if (this.theme.includes('/')) {
+                calamaresIcon = `${this.theme}/theme/artwork/install-debian.png`;
+            }
             if (node_fs_1.default.existsSync(calamaresIcon)) {
                 shelljs_1.default.cp(calamaresIcon, '/usr/share/icons/');
             }
             else {
-                console.log(`${calamaresIcon} not found!`);
+                console.log(`${calamaresIcon} icon not found!`);
                 process.exit();
             }
-            const calamaresLauncher = node_path_1.default.resolve(__dirname, `../../../addons/${this.remix.branding}/theme/applications/install-debian.desktop`);
+            let calamaresLauncher = node_path_1.default.resolve(__dirname, `../../../addons/${this.remix.branding}/theme/applications/install-debian.desktop`);
+            if (this.theme.includes('/')) {
+                calamaresLauncher = `${this.theme}/theme/applications/install-debian.desktop`;
+            }
             if (node_fs_1.default.existsSync(calamaresLauncher)) {
                 shelljs_1.default.cp(calamaresLauncher, '/usr/share/applications/');
             }
             else {
-                console.log(`${calamaresLauncher} not found!`);
+                console.log(`${calamaresLauncher} launcher not found!`);
                 process.exit();
             }
             // script di avvio

package/dist/classes/ovary.js

@@ -9,6 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 // packages
 const fs_1 = tslib_1.__importDefault(require("fs"));
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const node_os_1 = tslib_1.__importDefault(require("node:os"));
 const shelljs_1 = tslib_1.__importDefault(require("shelljs"));
@@ -47,6 +48,7 @@ class Ovary {
         this.snapshot_prefix = '';
         this.snapshot_basename = '';
         this.compression = '';
+        this.theme = '';
         this.clone = false;
     }
     /**
@@ -63,7 +65,7 @@ class Ovary {
                 this.settings.config.snapshot_basename = snapshot_basename;
             }
             if (theme !== '') {
-                this.settings.config.theme = theme;
+                this.theme = theme;
             }
             if (compression !== '') {
                 this.settings.config.compression = compression;
@@ -106,7 +108,7 @@ class Ovary {
         if (!fs_1.default.existsSync(this.settings.config.snapshot_dir)) {
             shelljs_1.default.mkdir('-p', this.settings.config.snapshot_dir);
         }
-        await this.settings.loadRemix(this.snapshot_basename, this.settings.config.theme);
+        await this.settings.loadRemix(this.snapshot_basename, this.theme);
         if (utils_2.default.isLive()) {
             console.log(chalk_1.default.red('>>> eggs: This is a live system! An egg cannot be produced from an egg!'));
         }
@@ -159,10 +161,10 @@ class Ovary {
                  * viene creata la configurazione dell'installer: krill/calamares
                  * L'installer prende il tema da settings.remix.branding
                  */
-                this.incubator = new incubator_1.default(this.settings.remix, this.settings.distro, this.settings.config.user_opt, verbose);
+                this.incubator = new incubator_1.default(this.settings.remix, this.settings.distro, this.settings.config.user_opt, this.theme, verbose);
                 await this.incubator.config(release);
                 await this.syslinux();
-                await this.isolinux(this.settings.config.theme);
+                await this.isolinux(this.theme);
                 await this.kernelCopy();
                 /**
                  * we need different behaviour on
@@ -175,7 +177,7 @@ class Ovary {
                     await this.initrdCreate();
                 }
                 if (this.settings.config.make_efi) {
-                    await this.makeEfi(this.settings.config.theme);
+                    await this.makeEfi(this.theme);
                 }
                 await this.bindLiveFs();
                 /**
@@ -216,15 +218,15 @@ class Ovary {
              * patch to emulate miso/archiso on archilinux
              */
             if (this.familyId === 'archlinux') {
-                await (0, utils_1.exec)(`mkdir ${this.settings.work_dir.pathIso}/live/x86_64`, this.echo);
                 if (this.settings.distro.distroId === 'ManjaroLinux') {
-                    await (0, utils_1.exec)(`ln ${this.settings.work_dir.pathIso}/live/filesystem.squashfs ${this.settings.work_dir.pathIso}/live/x86_64/livefs.sfs`, this.echo);
-                    await (0, utils_1.exec)(`md5sum ${this.settings.work_dir.pathIso}/live/filesystem.squashfs > ${this.settings.work_dir.pathIso}/live/x86_64/livefs.md5`, this.echo);
+                    await (0, utils_1.exec)(`mkdir ${this.settings.work_dir.pathIso}manjaro/x86_64 -p`, this.echo);
+                    await (0, utils_1.exec)(`ln ${this.settings.work_dir.pathIso}live/filesystem.squashfs ${this.settings.work_dir.pathIso}manjaro/x86_64/livefs.sfs`, this.echo);
+                    await (0, utils_1.exec)(`md5sum ${this.settings.work_dir.pathIso}live/filesystem.squashfs > ${this.settings.work_dir.pathIso}manjaro/x86_64/livefs.md5`, this.echo);
                 }
                 else if (this.settings.distro.distroId === 'Arch') {
-                    await (0, utils_1.exec)(`ln ${this.settings.work_dir.pathIso}/live/filesystem.squashfs ${this.settings.work_dir.pathIso}/live/x86_64/airootfs.sfs`, this.echo);
-                    await (0, utils_1.exec)(`sha512sum ${this.settings.work_dir.pathIso}/live/filesystem.squashfs > ${this.settings.work_dir.pathIso}/live/x86_64/fs.sha512`, this.echo);
-                    // await exec(`gpg --detach-sign ${this.settings.work_dir.pathIso}/live/filesystem.squashfs ${this.settings.work_dir.pathIso}/live/x86_64/fs.sig`, this.echo)
+                    await (0, utils_1.exec)(`mkdir ${this.settings.work_dir.pathIso}arch/x86_64 -p`, this.echo);
+                    await (0, utils_1.exec)(`ln ${this.settings.work_dir.pathIso}live/filesystem.squashfs          ${this.settings.work_dir.pathIso}arch/x86_64/airootfs.sfs`, this.echo);
+                    await (0, utils_1.exec)(`sha512sum ${this.settings.work_dir.pathIso}live/filesystem.squashfs > ${this.settings.work_dir.pathIso}arch/x86_64/airootfs.sha512`, this.echo);
                 }
             }
             await this.makeIso(xorrisoCommand, scriptOnly);
@@ -272,9 +274,10 @@ class Ovary {
             this.tryCatch(cmd);
             cmd = `mkdir -p ${this.settings.work_dir.pathIso}/efi/boot`;
             this.tryCatch(cmd);
+            let liveBsseDir = 'live';
             cmd = `mkdir -p ${this.settings.work_dir.pathIso}/isolinux`;
             this.tryCatch(cmd);
-            cmd = `mkdir -p ${this.settings.work_dir.pathIso}/live`;
+            cmd = `mkdir -p ${this.settings.work_dir.pathIso}live`;
             this.tryCatch(cmd);
         }
     }
@@ -523,7 +526,10 @@ class Ovary {
          * isolinux.theme.cfg
          */
         const isolinuxThemeDest = this.settings.work_dir.pathIso + 'isolinux/isolinux.theme.cfg';
-        const isolinuxThemeSrc = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/isolinux.theme.cfg`);
+        let isolinuxThemeSrc = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/isolinux.theme.cfg`);
+        if (this.theme.includes('/')) {
+            isolinuxThemeSrc = `${theme}/theme/livecd/isolinux.theme.cfg`;
+        }
         if (!fs_1.default.existsSync(isolinuxThemeSrc)) {
             utils_2.default.warning('Cannot find: ' + isolinuxThemeSrc);
             process.exit();
@@ -545,10 +551,10 @@ class Ovary {
         if (this.familyId === 'archlinux') {
             let volid = utils_2.default.getVolid(this.settings.remix.name);
             if (this.settings.distro.distroId === 'ManjaroLinux') {
-                kernel_parameters += ` misobasedir=live misolabel=${volid}`;
+                kernel_parameters += ` misobasedir=manjaro misolabel=${volid}`;
             }
             else if (this.settings.distro.distroId === 'Arch') {
-                kernel_parameters += ` archisobasedir=live archisolabel=${volid} cow_spacesize=4G`;
+                kernel_parameters += ` archisobasedir=arch archisolabel=${volid} cow_spacesize=4G`;
             }
         }
         const template = fs_1.default.readFileSync(isolinuxTemplate, 'utf8');
@@ -564,7 +570,10 @@ class Ovary {
          * splash
          */
         const splashDest = `${this.settings.work_dir.pathIso}/isolinux/splash.png`;
-        const splashSrc = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/splash.png`);
+        let splashSrc = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/splash.png`);
+        if (this.theme.includes('/')) {
+            splashSrc = node_path_1.default.resolve(`${theme}/theme/livecd/splash.png`);
+        }
         if (!fs_1.default.existsSync(splashSrc)) {
             utils_2.default.warning('Cannot find: ' + splashSrc);
             process.exit();
@@ -580,7 +589,6 @@ class Ovary {
         }
         let lackVmlinuzImage = false;
         if (fs_1.default.existsSync(this.settings.kernel_image)) {
-            console.log('kernel image:' + this.settings.kernel_image);
             await (0, utils_1.exec)(`cp ${this.settings.kernel_image} ${this.settings.work_dir.pathIso}/live/`, this.echo);
         }
         else {
@@ -943,36 +951,33 @@ class Ovary {
         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));
         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));
-        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));
         cmds.push(await rexec('chroot  ' + this.settings.work_dir.merged + ' cp /etc/skel/. /home/' + this.settings.config.user_opt + ' -R', this.verbose));
-        // cmds.push(await rexec('chroot  ' + this.settings.work_dir.merged + ' cp /etc/skel/. /home/' + this.settings.config.user_opt + ' -R', verbose))
         cmds.push(await rexec('chroot  ' + this.settings.work_dir.merged + ' chown ' + this.settings.config.user_opt + ':users' + ' /home/' + this.settings.config.user_opt + ' -R', 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
+        cmds.push(await rexec('chroot ' + this.settings.work_dir.merged + ' echo root:' + this.settings.config.root_passwd + '| chroot ' + this.settings.work_dir.merged + ' chpasswd', this.verbose));
         if (this.familyId === 'debian') {
-            // add user live to sudo
             cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG sudo ${this.settings.config.user_opt}`, this.verbose));
-            // educaandos
-            if (this.settings.config.theme === 'educaandos') {
-                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG adm ${this.settings.config.user_opt}`, this.verbose));
-                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 dip ${this.settings.config.user_opt}`, this.verbose));
-                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG plugdev ${this.settings.config.user_opt}`, this.verbose));
-                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG lpadmin ${this.settings.config.user_opt}`, this.verbose));
-                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG sambashare ${this.settings.config.user_opt}`, this.verbose));
-                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG admin ${this.settings.config.user_opt}`, this.verbose));
-            }
         }
         else if (this.familyId === 'archlinux') {
-            // adduser live to wheel and autologin
-            // cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG wheel ${this.settings.config.user_opt}`, this.verbose))
-            // in manjaro they use autologin group for the iso, if not exist create it
-            // cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} test $(grep "autologin" /etc/group) || chroot ${this.settings.work_dir.merged} groupadd -r autologin`, this.verbose))
-            // cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG autologin ${this.settings.config.user_opt}`, this.verbose))
             cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} gpasswd -a ${this.settings.config.user_opt} wheel`, this.verbose));
             cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} gpasswd -a ${this.settings.config.user_opt} sudo`, this.verbose));
             cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} gpasswd -a ${this.settings.config.user_opt} autologin`, this.verbose));
         }
-        if (this.familyId === 'debian' || this.familyId === 'archlinux') {
-            cmds.push(await rexec('chroot ' + this.settings.work_dir.merged + ' echo root:' + this.settings.config.root_passwd + '| chroot ' + this.settings.work_dir.merged + ' chpasswd', this.verbose));
+        /**
+         * educaandos and others themes
+         * users.yml
+         */
+        let usersConf = node_path_1.default.resolve(__dirname, `../../addons/${this.theme}/theme/calamares/users.yml`);
+        if (this.theme.includes('/')) {
+            usersConf = `${this.theme}/theme/calamares/modules/users.yml`;
+        }
+        if (fs_1.default.existsSync(usersConf)) {
+            const o = js_yaml_1.default.load(fs_1.default.readFileSync(usersConf, 'utf-8'));
+            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));
+            }
         }
     }
     /**
@@ -1023,8 +1028,8 @@ class Ovary {
         if (myAddons.adapt) {
             const dirAddon = node_path_1.default.resolve(__dirname, `../../addons/eggs/adapt/`);
             shelljs_1.default.cp(`${dirAddon}/applications/eggs-adapt.desktop`, `${this.settings.work_dir.merged}/usr/share/applications/`);
-            shelljs_1.default.cp(`${dirAddon}/bin/adapt`, `${this.settings.work_dir.merged}/usr/local/bin/`);
-            shelljs_1.default.chmod('+x', `${this.settings.work_dir.merged}/usr/local/bin/adapt`);
+            shelljs_1.default.cp(`${dirAddon}/bin/adapt`, `${this.settings.work_dir.merged}/usr/bin/`);
+            shelljs_1.default.chmod('+x', `${this.settings.work_dir.merged}/usr/bin/adapt`);
         }
         // ichoice
         if (myAddons.ichoice) {
@@ -1032,8 +1037,8 @@ class Ovary {
             installerIcon = 'system-software-install';
             const dirAddon = node_path_1.default.resolve(__dirname, '../../addons/eggs/ichoice/');
             shelljs_1.default.cp(`${dirAddon}/applications/eggs-ichoice.desktop`, `${this.settings.work_dir.merged}/usr/share/applications/`);
-            shelljs_1.default.cp(`${dirAddon}/bin/eggs-ichoice.sh`, `${this.settings.work_dir.merged}/usr/local/bin/`);
-            shelljs_1.default.chmod('+x', `${this.settings.work_dir.merged}/usr/local/bin/eggs-ichoice.sh`);
+            shelljs_1.default.cp(`${dirAddon}/bin/eggs-ichoice.sh`, `${this.settings.work_dir.merged}/usr/bin/`);
+            shelljs_1.default.chmod('+x', `${this.settings.work_dir.merged}/usr/bin/eggs-ichoice.sh`);
         }
         // pve
         if (myAddons.pve) {
@@ -1204,7 +1209,10 @@ class Ovary {
         * copy splash to efiWorkDir
         */
         const splashDest = `${efiWorkDir}/boot/grub/splash.png`;
-        const splashSrc = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/splash.png`);
+        let splashSrc = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/splash.png`);
+        if (this.theme.includes('/')) {
+            splashSrc = `${theme}/theme/livecd/splash.png`;
+        }
         if (!fs_1.default.existsSync(splashSrc)) {
             utils_2.default.warning('Cannot find: ' + splashSrc);
             process.exit();
@@ -1214,7 +1222,10 @@ class Ovary {
          * copy theme
          */
         const themeDest = `${efiWorkDir}/boot/grub/theme.cfg`;
-        const themeSrc = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/grub.theme.cfg`);
+        let themeSrc = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/grub.theme.cfg`);
+        if (this.theme.includes('/')) {
+            themeSrc = `${theme}/theme/livecd/grub.theme.cfg`;
+        }
         if (!fs_1.default.existsSync(themeSrc)) {
             utils_2.default.warning('Cannot find: ' + themeSrc);
             process.exit();
@@ -1278,15 +1289,18 @@ class Ovary {
         // chown -R 1000:1000 $(pwd) 2>/dev/null
         // Cleanup efi temps
         await (0, utils_1.exec)(`umount ${efiWorkDir}/img-mnt`, this.echo);
-        // await exec(`rmdir ${efiWorkDir}/img-mnt`, echo)
-        // await exec(`rm ${memdiskDir}/img-mnt -rf`, echo)
+        await (0, utils_1.exec)(`rmdir ${efiWorkDir}/img-mnt`, this.echo);
+        await (0, utils_1.exec)(`rm ${memdiskDir}/img-mnt -rf`, this.echo);
         //  popd
         // Copy efi files to iso
         await (0, utils_1.exec)(`rsync -avx  ${efiWorkDir}/boot ${isoDir}/`, this.echo);
         await (0, utils_1.exec)(`rsync -avx ${efiWorkDir}/efi  ${isoDir}/`, this.echo);
         // Do the main grub.cfg (which gets loaded last):
         // grub.theme.cfg
-        const grubThemeSrc = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/grub.theme.cfg`);
+        let grubThemeSrc = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/grub.theme.cfg`);
+        if (this.theme.includes('/')) {
+            grubThemeSrc = `${theme}/theme/livecd/grub.theme.cfg`;
+        }
         const grubThemeDest = `${isoDir}/boot/grub/theme.cfg`;
         if (!fs_1.default.existsSync(grubThemeSrc)) {
             utils_2.default.warning('Cannot find: ' + grubThemeSrc);
@@ -1308,25 +1322,20 @@ class Ovary {
         if (this.familyId === 'archlinux') {
             let volid = utils_2.default.getVolid(this.settings.remix.name);
             if (this.settings.distro.distroId === 'ManjaroLinux') {
-                kernel_parameters += ` misobasedir=live misolabel=${volid}`;
+                kernel_parameters += ` misobasedir=manjaro misolabel=${volid}`;
             }
             else if (this.settings.distro.distroId === 'Arch') {
-                kernel_parameters += ` archisobasedir=live archisolabel=${volid} cow_spacesize=4G`;
+                kernel_parameters += ` archisobasedir=arch archisolabel=${volid} cow_spacesize=4G`;
             }
         }
         const grubDest = `${isoDir}/boot/grub/grub.cfg`;
         const template = fs_1.default.readFileSync(grubTemplate, 'utf8');
-        // let rmModules = ''
-        // if (this.settings.distro.codenameLikeId === 'focal') {
-        // rmModules = 'rmmod tpm'
-        // }
         const view = {
             fullname: this.settings.remix.fullname.toUpperCase(),
             kernel: utils_2.default.kernelVersion(),
             vmlinuz: `/live${this.settings.vmlinuz}`,
             initrdImg: `/live${this.settings.initrdImg}`,
             kernel_parameters: kernel_parameters,
-            // rmModules: rmModules,
         };
         fs_1.default.writeFileSync(grubDest, mustache_1.default.render(template, view));
         /**