penguins-eggs 9.1.26 → 9.1.29

package/README.md

@@ -25,31 +25,33 @@ penguins-eggs
 <!-- tocstop -->
 
 # Presentation
-penguins-eggs is a console utility, in active development, who let you to remaster your system and redistribuite it as iso images or from the lan via PXE remote boot.
+penguins-eggs is a console utility, under continuous development, that allows you to remaster your system and redistribute it as iso images or via remote boot PXE.
 
-The scope of this project is to implement the process of remastering your version of Linux, generate it as ISO image to burn on a CD/DVD or copy to a usb key to boot your system. You can also boot your egg - via remote boot - on your LAN. You can easily install your live system with gui calamares installer or eggs cli installer.
+The purpose of this project is to implement the process of remastering your own version of Linux, generate it as an ISO image to burn to a CD/DVD or copy to a USB stick to boot your system. You can also boot your "egg" via remote booting-on your LAN. You can easily install your live system with the calamares installer or the eggs TUI installer.
 
-All it is written in pure typescript, so ideally can be used with differents Linux distros. Yes, there are big differences about package manager used, but not so much in the way to work of bash and in the various programs used to build the iso.
+Also, thanks to the wardrobe, you can create or use scripts to switch from a "naked" version - with only a CLI interface - and "wear" it with a GUI or server configurations. See [penguins-wardrobe](https://github.com/pieroproietti/penguins-wardrobe), fork it and adapt it to yours needs.
 
-penguins-eggs, at the moment 2021 may is a mature tool and is extremely usefull, You can easily create your personal customized iso or your organization/school version of Linux and deploy it on your LAN, give it to your friends as usb key or publish yours eggs in the internet!
+The whole thing is written in pure typescript, so ideally it can be used with different Linux distributions. Yes, there are major differences in terms of the package manager used, but not so much in the way bash works and the various programs used to build the isos.
 
-Try penguins-eggs, yes it is a console utility - no GUI - but don't be scared, penguins-eggs is a console command - really very simple - if you are able to open a terminal, you can use it and yours final users will enjoy of full gui and pratical installer to install your livecd.
+penguins-eggs, as of May 2022, is a mature tool and is extremely powerful: you can easily create your own custom version of Linux for your organization/school and distribute it on your LAN, give it to your friends as a usb key, or post your images on the Internet!
+
+Have no fear, yes eggs is a console utility - without a graphical user interface - but it is really simple - if you are able to open a terminal, you can use it and your end users will enjoy a complete help and fully graphical installation procedure.
 
 ### mom and dad
-I've added two lightweight assistants integrated with eggs: mom and dad. While mom is a bash script with whiptail - and guides the user to the various commands and documentation, dad started as a short way to create isos. All you have to do is type **sudo eggs dad** and follow simple instructions. You can also shortcut the way to reset the configuration **sudo dad -c** or - even faster - reset the configuration, load defaults, kill created isos. Simply type **sudo eggs dad -d** and you will immediately be able to produce the egg in the default /home/eggs nest.
+I've added two lightweight assistants integrated with eggs: mom and dad. While mom is a bash script with whiptail - and guides the user to the various commands and documentation, dad started as a short way to create isos. All you have to do is type **sudo eggs dad** and follow simple instructions. You can also shortcut the way to reset the configuration **sudo dad -c** or - even faster - reset the configuration, load defaults, kill created isos: simply type **sudo eggs dad -d** and you will immediately be able to produce the egg in the default /home/eggs nest.
 
 ### yolk 
-yolk so called - staying on the subject of eggs - is a local repository included in the livecd that contains a minimum of indispensable packages during installation. Thanks to yolk, you can safely install your system without the need of an active internet connection.
+yolk - so called staying on the subject of eggs - is a local repository included in the livecd that contains a minimum of indispensable packages during installation. Thanks to yolk, you can safely install your system without the need of an active internet connection.
 
 ### wardrobe
 wardrobe was added to eggs on april 2022, it's is a way to guide and consolidate the process of creating a custom version of Linux, starting from a CLI system. All my personal editions are passed to use wardrobe for their convenience, in that way I can organize, consolidate and manage better my work. I used birds names for my customizations, we have: colibri, duck, eagle, owl, wagtail and warbier. 
 
 I hope peoples will be interested in wardrobe and you will end to fork the main repository and add your customizations: together will be possibile to make great steps impossible for a single developer. 
 
-You can read more in wardrobe on [penguin's eggs blog](https://penguins-eggs.net/2022/04/12/wardrobe-colibri-duck-eagle-and-owl/). The result of mine customizations are under [ISOs/Debian/bullseys](https://sourceforge.net/projects/penguins-eggs/files/iso/debian/bullseye/) on my sourgeforce page.
+You can read more in wardrobe on [penguin's eggs blog](https://penguins-eggs.net/2022/04/12/wardrobe-colibri-duck-eagle-and-owl/). The results of mine customizations are mostly under [Debian bullseye](https://sourceforge.net/projects/penguins-eggs/files/iso/debian/bullseye/), [Devuan chimaera](https://sourceforge.net/projects/penguins-eggs/files/iso/devuan/chimaera/) and [Ubuntu jammy](https://sourceforge.net/projects/penguins-eggs/files/iso/ubuntu/jammy/) on my sourgeforce page.
 
 ### krill
-eggs include a CLI installer named krill, this ley you to produce and install servers configurations. krill use a nice TUI interface using the same, configuration created by eggs for [calamares](calamares.io). This lead to have "about the same" experience installing, from old distros to new one and for GUI and CLI. To force using krill in place of calamares in a GUI system just: **sudo eggs install --cli**
+eggs include a CLI installer named krill, this let you to produce and install servers configurations. krill use a nice TUI interface using the same, configuration created by eggs for [calamares](calamares.io). This lead to have "about the same" experience installing, from old distros to new ones and for GUI and CLI. To force using krill in place of calamares in a GUI system just: **sudo eggs install --cli**
 
 ### addons and themes
 Addons are used mostly to let third parties to develop extensions. Note that currently we have an extension for the theme that includes both branding calamares, link and installer icon. In addition, also as an addon has been developed choose between GUI or CLI installation, adapt the video resolution, link to remote support, etc.
@@ -60,12 +62,11 @@ You can use the backup mode by simply adding --backup in the produce command. Th
 * ```eggs produce``` just remove users accounts and home. This let to have working servers examples;
 * ```eggs produce --backup``` remove servers and users data from live, and put them on a LUKS volume.
 
-Since version 9.0.16 we have two new commands: ```eggs syncfrom``` (alias restore) and ```eggs syncto``` (alias backup).
+We have another two commands for backup/restore: ```eggs syncfrom``` and ```eggs syncto```. A working installation, can easily sync users and servers data to a luks-eggs-backup file:
 
-A working installation, can easily sync users and servers data to a luks-eggs-backup:
 * ```eggs syncto -f /tmp/luks-eggs-backup``` backup users and servers data to LUKS volume /tmp/luks-eggs-backup:
 
-A new installation, can easyly get users and servers data from a luks-eggs-backup:
+Or a new installation, can easyly get users and servers data from a luks-eggs-backup:
 * ```eggs syncfrom from -f /tmp/luks-eggs-backup``` restore users and servers data from the LUKS volume /tmp/luks-eggs-backup.
 
 **NOTE:** 
@@ -73,17 +74,16 @@ A new installation, can easyly get users and servers data from a luks-eggs-backu
 * installing with calamares: when installation is finished, you need to mount the rootdir of your installed system and, give the following command: ```sudo eggs syncfrom -f /path/to/luks-eggs-backup -r /path/to/rootdir```
 * it's possbile actually to change the nest directory, editing configuration file ```/etc/penguins-eggs.d/eggs.yaml```. Example: ```set snapshot_dir: '/opt/eggs/'```, but you can't use the following: /etc, /boot, /usr and /var.
 
-**DISCLAIM:** using this new feathures can be dangerous for your data:
-* ```syncfrom``` replace all users homes and all servers homes with data from the luck-eggs-backup, Force this data in not appropriate system can easily end in a long disaster recovery;
-* I want stress you again on the fact we are working with a **live filesystem** mounted binded to the **REAL filesystem**. This mean who removing a directory under the nest, usually ```/nest/ovarium/filesystem.squashfs```, mean remove it from the REAL filesystem. So, if something went wrong during the iso production and You remain with live filesystem again binded, the shortest way to solve the problem is simply reboot.
+**DISCLAIM:** using this feathures in non appropriate way can be dangerous for your data:
+* ```syncfrom``` replace all users homes and all servers homes with data from the luck-eggs-backup file, Force this data in a not appropriate system can easily end in a long disaster recovery.
 
 ## What distributions can I use?
-eggs was born on Debian strecth/buster, but actually full support Debian from jessie to bookworm/sid, Devuan beowulf, chimaera, daedalus, Ubuntu bionic, focal, jammy and all derivatives including Linux mint, Deepin, neon KDE, etc. Eggs is able to remaster and install manjaro linux too and derivated.
+eggs was born on Debian strecth, buster and following, actually full support Debian from jessie to bookworm/sid, Devuan beowulf, chimaera, daedalus, Ubuntu bionic, focal, jammy and all derivatives from them, including Linux mint, Deepin, neon KDE, etc. Eggs is able to remaster and install manjaro linux too and derivated, i need help to continue the effort to manjaro.
 
 You can read more on the [blog](https://penguins-eggs.net/2021/11/02/distros-that-can-be-remastered-with-eggs/), some examples of iso images remastered with eggs are in the [sourceforge page of the project](https://sourceforge.net/projects/penguins-eggs/files/iso/). 
 
 ## What architecture can I use?
-From eggs v. 8.0.4 I'm releasing eggs in 4 differents architectures: **i386**, **amd64**, **arm64** and **armel**. eggs - at the moment - produce in i386 and amd64, but can be installed already on arm64 and armel. This mean who it is possible to install it in [raspberrypi](https://www.raspberrypi.org/), but again not possible to produce a [Raspberry Pi OS](https://www.raspberrypi.org/software/) egg in armel or arm64. I'm working to complete this step, but need help and experience. 
+Eggs, can be released for differents architectures: **amd64**, **arm64** and **armel**. Actually I'm producing mainly for PCs (amd64) and armel. Someone want to contribute to bring eggs on [raspberrypi](https://www.raspberrypi.org/)?
 
 # Packages
 eggs is released deb packages for i386, amd64, armel and arm64 architectures. Due the characteristic of eggs, they can installed in Debian, Devuan or Ubuntu based distros, withouth worries about different versions, except for the architecture. It include standard scripts for preinst, postinst, prerm and postrm.
@@ -108,7 +108,7 @@ Update your repositories: **sudo apt update** and install eggs: **sudo apt insta
 The simplest way to install eggs is download the [package eggs](https://sourceforge.net/projects/penguins-eggs/files/packages-deb/) from [sourceforge page of the project](https://sourceforge.net/projects/penguins-eggs/) and install it
 
 ```
-sudo dpkg -i eggs_9.1.24_amd64.deb
+sudo dpkg -i eggs_9.1.26_amd64.deb
 ```
 
 or, on a i386 system:
@@ -132,7 +132,7 @@ $ npm install -g penguins-eggs
 $ eggs COMMAND
 running command...
 $ eggs (--version|-v)
-penguins-eggs/9.1.26 linux-x64 node-v18.2.0
+penguins-eggs/9.1.29 linux-x64 node-v16.15.0
 $ eggs --help [COMMAND]
 USAGE
   $ eggs COMMAND
@@ -188,7 +188,7 @@ DESCRIPTION
   adapt monitor resolution for VM only
 ```
 
-_See code: [src/commands/adapt.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.26/src/commands/adapt.ts)_
+_See code: [src/commands/adapt.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.29/src/commands/adapt.ts)_
 
 ## `eggs analyze`
 
@@ -209,7 +209,7 @@ EXAMPLES
   $ sudo eggs analyze
 ```
 
-_See code: [src/commands/analyze.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.26/src/commands/analyze.ts)_
+_See code: [src/commands/analyze.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.29/src/commands/analyze.ts)_
 
 ## `eggs autocomplete [SHELL]`
 
@@ -267,7 +267,7 @@ EXAMPLES
   install calamares and create it's configuration's files
 ```
 
-_See code: [src/commands/calamares.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.26/src/commands/calamares.ts)_
+_See code: [src/commands/calamares.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.29/src/commands/calamares.ts)_
 
 ## `eggs config`
 
@@ -291,7 +291,7 @@ EXAMPLES
   Configure and install prerequisites deb packages to run it
 ```
 
-_See code: [src/commands/config.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.26/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.29/src/commands/config.ts)_
 
 ## `eggs dad`
 
@@ -311,7 +311,7 @@ DESCRIPTION
   ask help from daddy - configuration helper
 ```
 
-_See code: [src/commands/dad.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.26/src/commands/dad.ts)_
+_See code: [src/commands/dad.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.29/src/commands/dad.ts)_
 
 ## `eggs export deb`
 
@@ -402,7 +402,7 @@ DESCRIPTION
   informations about eggs configuration
 ```
 
-_See code: [src/commands/info.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.26/src/commands/info.ts)_
+_See code: [src/commands/info.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.29/src/commands/info.ts)_
 
 ## `eggs install`
 
@@ -427,7 +427,7 @@ EXAMPLES
   Install the system using GUI or CLI installer
 ```
 
-_See code: [src/commands/install.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.26/src/commands/install.ts)_
+_See code: [src/commands/install.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.29/src/commands/install.ts)_
 
 ## `eggs kill`
 
@@ -449,7 +449,7 @@ EXAMPLES
   kill the eggs/free the nest
 ```
 
-_See code: [src/commands/kill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.26/src/commands/kill.ts)_
+_See code: [src/commands/kill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.29/src/commands/kill.ts)_
 
 ## `eggs mom`
 
@@ -466,7 +466,7 @@ DESCRIPTION
   ask for mommy - gui helper
 ```
 
-_See code: [src/commands/mom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.26/src/commands/mom.ts)_
+_See code: [src/commands/mom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.29/src/commands/mom.ts)_
 
 ## `eggs produce`
 
@@ -527,7 +527,7 @@ EXAMPLES
   in /home/eggs/ovarium and you can customize all you need
 ```
 
-_See code: [src/commands/produce.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.26/src/commands/produce.ts)_
+_See code: [src/commands/produce.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.29/src/commands/produce.ts)_
 
 ## `eggs remove`
 
@@ -557,7 +557,7 @@ EXAMPLES
   remove eggs, eggs configurations, packages dependencies
 ```
 
-_See code: [src/commands/remove.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.26/src/commands/remove.ts)_
+_See code: [src/commands/remove.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.29/src/commands/remove.ts)_
 
 ## `eggs syncfrom`
 
@@ -581,11 +581,11 @@ EXAMPLES
   $ sudo eggs restore
 ```
 
-_See code: [src/commands/syncfrom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.26/src/commands/syncfrom.ts)_
+_See code: [src/commands/syncfrom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.29/src/commands/syncfrom.ts)_
 
 ## `eggs syncto`
 
-Backup users, server and datas to luks-eggs-backup
+saving users' datas and accounts on LUKS volume
 
 ```
 USAGE
@@ -598,13 +598,13 @@ FLAGS
   --delete=<value>    rsync --delete delete extraneous files from dest dirs
 
 DESCRIPTION
-  Backup users, server and datas to luks-eggs-backup
+  saving users' datas and accounts on LUKS volume
 
 EXAMPLES
   $ sudo eggs syncto
 ```
 
-_See code: [src/commands/syncto.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.26/src/commands/syncto.ts)_
+_See code: [src/commands/syncto.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.29/src/commands/syncto.ts)_
 
 ## `eggs tools clean`
 
@@ -699,7 +699,7 @@ EXAMPLES
   update/upgrade the penguin's eggs tool
 ```
 
-_See code: [src/commands/update.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.26/src/commands/update.ts)_
+_See code: [src/commands/update.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.29/src/commands/update.ts)_
 
 ## `eggs version`
 

package/addons/eggs/adapt/applications/eggs-adapt.desktop

@@ -3,7 +3,7 @@
 Encoding=UTF-8
 Name=adapt resolution
 Type=Application
-Exec=/usr/bin/eggs adapt
+Exec=/usr/local/bin/adapt
 Icon=video-display
 Categories=GNOME;GTK;Utility;
 Name[it]=Adatta risoluzione

package/addons/eggs/adapt/bin/{eggs-adapt.sh → adapt}

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 xrandr --output Virtual-0 --auto > /dev/null
 xrandr --output Virtual-1 --auto > /dev/null
 xrandr --output Virtual-2 --auto > /dev/null

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

@@ -3,7 +3,7 @@
 # Syntax is YAML 1.2
 ---
 # "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules
-modules-search: [local, /usr/lib/calamares/modules]
+modules-search: [local, /usr/lib/calamares/modules, /usr/lib/x86_64-linux-gnu/calamares/modules]
 
 sequence:
   - show:
@@ -18,7 +18,7 @@ sequence:
       - mount
       - unpackfs
       - sources-yolk
-      - {{hasSystemd}}machineid
+      {{hasSystemd}}machineid
       - fstab
       - locale
       - keyboard
@@ -39,8 +39,8 @@ sequence:
       - add386arch
       - packages
       - removeuser
-      - remove-link
       - sources-yolk-unmount
+      - cleanup
       - umount
   - show:
       - finished

package/conf/distros/buster/calamares/calamares-modules/cleanup/cleanup.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
+
+if [ -f "$CHROOT"/etc/motd ]; then
+    sed -i '/^eggs-start-message/,/^\eggs-end-message/{/^#/!{/^\$/!d;};}' "$CHROOT"/etc/motd
+fi
+
+if [ -f "$CHROOT"/etc/issue ]; then
+    sed -i '/^eggs-start-message/,/^\eggs-end-message/{/^#/!{/^\$/!d;};}' "$CHROOT"/etc/issue
+fi
+
+rm -r $CHROOT/usr/share/applications/install-debian.desktop

package/conf/distros/buster/calamares/calamares-modules/cleanup/module.yml

@@ -0,0 +1,9 @@
+# Common
+# cleanup
+---
+type: "job"
+name: "cleanup"
+interface: "process"
+chroot: false
+command: "/usr/sbin/cleanup.sh"
+timeout: 8

package/conf/distros/buster/calamares/modules/finished.yml

@@ -2,5 +2,5 @@
 ---
 restartNowEnabled: true
 restartNowChecked: true
-# restartNowCommand: {{restartNowCommand}}
-restartNowCommand: "systemctl -i reboot"
+restartNowCommand: {{restartNowCommand}}
+# restartNowCommand: "systemctl -i reboot"

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

@@ -38,9 +38,9 @@ disable-cancel-during-exec: false
 quit-at-end: false
 
 instances:
-- id:       eggs-cleanup
+- id:       cleanup
   module:   shellprocess
-  config:   shellprocess_eggs-cleanup.conf
+  config:   shellprocess_cleanup.conf
 
 sequence:
   # Phase 1 - prepare.
@@ -87,9 +87,8 @@ sequence:
       - initramfs
       # dpkg-unsafe-io-undo
       - removeuser
-      - shellprocess@eggs-cleanup
-      - remove-link
       - sources-yolk-unmount
+      - cleanup
       - umount
 
   # Phase 3 - postinstall.
@@ -129,4 +128,3 @@ prompt-install: false
 #
 # YAML: boolean.
 dont-chroot: false
-

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

@@ -57,8 +57,8 @@ sequence:
       - shellprocess@add386arch
       - packages
       - removeuser
-      - remove-link
       #  - shellprocess@logs
+      - cleanup
       - sources-yolk-unmount
       - umount
   - show:

package/conf/distros/jessie/krill/settings.yml

@@ -47,8 +47,8 @@ sequence:
       - initramfscfg
       - initramfs
       - removeuser
-      - remove-link
       - sources-yolk-unmount
+      - cleanup
       - umount
 
   # Phase 3 - postinstall.

package/conf/distros/rolling/calamares/modules/packages.yml

@@ -1,7 +1,7 @@
-# Debian Buster
+# manjaro
 # packages
 ---
-backend: apt
+backend: pamac
 
 operations:
 {{remove}}

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

@@ -4,9 +4,9 @@
 modules-search: [local, /usr/lib/calamares/modules, /usr/share/calamares]
 
 instances:
-- id:       eggs-cleanup
+- id:       cleanup
   module:   shellprocess
-  config:   shellprocess_eggs-cleanup.conf
+  config:   shellprocess_cleanup.conf
 
 sequence:
   # Phase 1 - prepare.
@@ -51,7 +51,7 @@ sequence:
       #- initramfscfg
       #- initramfs
       - removeuser
-      #- shellprocess@eggs-cleanup
+      #- shellprocess@cleanup
       #- remove-link
       #- sources-yolk-unmount
       - umount

package/lib/classes/daddy.js

@@ -83,8 +83,11 @@ class Daddy {
                 }
                 case 'max': {
                     const filter = 'x86';
-                    if (process.arch === 'armel') {
-                        const filter = 'ARM';
+                    if (process.arch === 'arm') {
+                        const filter = 'ARM'; // to check
+                    }
+                    else if (process.arch === 'arm64') {
+                        const filter = 'ARM64'; // to check
                     }
                     config.compression = 'xz -Xbcj ' + filter;
                     break;

package/lib/classes/family/archlinux.js

@@ -36,6 +36,7 @@ class Archlinux {
      * Crea array pacchetti da installare/rimuovere
      */
     static packages(remove = false, verbose = false) {
+        // non può essere pacman è universalmente presente
         const packages = ['arch-install-scripts', 'awk', 'dosfstools', 'e2fsprogs', 'erofs-utils', 'findutils', 'gzip', 'libarchive', 'libisoburn', 'mtools', 'openssl', 'pacman', 'rsync', 'sed', 'syslinux', 'squashfs-tools'];
         const toInstall = [];
         const toRemove = [];

package/lib/classes/family/debian.js

@@ -24,13 +24,13 @@ class Debian {
      */
     static isInstalledXorg() {
         let test = 'xserver-xorg-core';
-        if (pacman_1.default.distro().codenameLikeId === 'bionic') {
-            /**
-             * BUT_ on Ubuntu bionic we have:
-             * xserver-xorg-core-hwe-18.04
-             */
-            test = 'xserver-xorg-core-hwe-18.04';
-        }
+        // if (Pacman.distro().codenameLikeId === 'bionic') {
+        /*
+         * BUT_ on Ubuntu bionic we have:
+         * xserver-xorg-core-hwe-18.04
+         */
+        // test = 'xserver-xorg-core-hwe-18.04'
+        //}
         return this.packageIsInstalled(test);
     }
     /**

package/lib/classes/incubation/distros/bionic.js

@@ -59,8 +59,8 @@ class Bionic {
         await fisherman.buildCalamaresModule('add386arch', false);
         await fisherman.modulePackages(this.distro, this.release); //
         await fisherman.moduleRemoveuser(this.user_opt); //
-        await fisherman.buildCalamaresModule('remove-link', true);
         await fisherman.buildCalamaresModule('sources-yolk-unmount', false);
+        await fisherman.buildCalamaresModule('cleanup', true);
         await fisherman.buildModule('umount');
         await fisherman.buildModule('finished');
     }

package/lib/classes/incubation/distros/buster.js

@@ -61,12 +61,11 @@ class Buster {
         await fisherman.buildModule('plymouthcfg');
         await fisherman.buildModule('initramfscfg');
         await fisherman.buildModule('initramfs');
-        await fisherman.shellprocess('eggs-cleanup');
         await fisherman.moduleRemoveuser(this.user_opt);
         await fisherman.buildCalamaresModule('dpkg-unsafe-io-undo', false);
         await fisherman.buildCalamaresModule('sources-yolk-unmount', false);
+        await fisherman.buildCalamaresModule('cleanup', true);
         await fisherman.buildModule('umount');
-        await fisherman.buildCalamaresModule('remove-link');
         await fisherman.moduleFinished();
     }
 }

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

@@ -62,9 +62,9 @@ class Focal {
         await fisherman.shellprocess('add386arch');
         await fisherman.modulePackages(this.distro, this.release); //
         await fisherman.moduleRemoveuser(this.user_opt);
-        await fisherman.buildCalamaresModule('remove-link', true);
         await fisherman.buildCalamaresModule('sources-yolk', false);
         await fisherman.buildCalamaresModule('sources-yolk-unmount', false);
+        await fisherman.buildCalamaresModule('cleanup', true);
         await fisherman.buildModule('umount');
         await fisherman.buildModule('finished');
     }

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

@@ -60,7 +60,6 @@ class Rolling {
         await fisherman.buildModule('plymouthcfg');
         // await fisherman.buildModule('initramfscfg')
         // await fisherman.buildModule('initramfs')
-        // await fisherman.shellprocess('eggs-cleanup')
         await fisherman.moduleRemoveuser(this.user_opt);
         // await fisherman.buildCalamaresModule('sources-yolk-unmount', false)
         // await fisherman.buildCalamaresModule('remove-link')

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

@@ -14,6 +14,9 @@ function remove(distro) {
     let removePackages = pacman_1.default.packages(remove);
     removePackages.push("calamares");
     removePackages.push("eggs");
+    if (distro.distroLike === 'Arch') {
+        removePackages = ["calamares"]; // penguins-eggs, manjaro-tools-iso, arch-install-scripts 
+    }
     const mustRemain = ["coreutils", "cryptsetup", "curl", "dosfstools", "git", "parted", "rsync"];
     let sorted = [];
     for (const elem of removePackages) {

package/lib/classes/incubation/incubator.js

@@ -95,6 +95,7 @@ class Incubator {
              * Manjaro
              */
             case 'rolling': {
+                release = true;
                 const rolling = new rolling_1.Rolling(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
                 await rolling.create();
                 break;

package/lib/classes/krill_install.d.ts

@@ -32,7 +32,6 @@
       - initramfscfg OK
       - initramfs OK
       - removeuser OK
-      - remove-link // OK
       - sources-yolk-unmount // execCalamaresModule('sources-yolk-unmount')
       - umount // this.umountVfs, this.umountFs
  */

package/lib/classes/krill_install.js

@@ -301,20 +301,20 @@ class Hatching {
             catch (error) {
                 await utils_1.default.pressKeyToExit(JSON.stringify(error));
             }
-            // delLiveUser
-            message = "Removing user live ";
-            percent = 0.70;
-            try {
-                redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
-                await this.delLiveUser();
-            }
-            catch (error) {
-                await utils_1.default.pressKeyToExit(JSON.stringify(error));
-            }
             /**
-             * if NOT restore users data
+             * IF NOT RESTORE USERS DATA
              */
             if (!fs_1.default.existsSync(this.luksFile)) {
+                // delLiveUser
+                message = "Removing user live ";
+                percent = 0.70;
+                try {
+                    redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                    await this.delLiveUser();
+                }
+                catch (error) {
+                    await utils_1.default.pressKeyToExit(JSON.stringify(error));
+                }
                 // addUser
                 message = "Adding user ";
                 percent = 0.73;
@@ -461,14 +461,14 @@ adduser ${name} \
     async delLiveUser() {
         if (utils_1.default.isLive()) {
             const user = this.settings.config.user_opt;
-            let cmd = `#!/bin/sh\ngetent passwd "${user}"  > /dev/null`;
             let userExists = false;
             try {
+                const cmd = `#!/bin/sh\ngetent passwd "${user}"  > /dev/null`;
                 await (0, utils_2.exec)(cmd, utils_1.default.setEcho(this.verbose));
                 userExists = true;
             }
             catch (error) {
-                // console.log(error)
+                console.log(error);
             }
             finally {
                 if (userExists) {

package/lib/classes/ovary.js

@@ -86,8 +86,6 @@ class Ovary {
         }
         let luksName = 'luks-eggs-backup';
         let luksFile = `/tmp/${luksName}`;
-        // let luksDevice = `/dev/mapper/${luksName}`
-        // let luksMountpoint = `/mnt`
         if (this.familyId === 'debian') {
             const yolk = new yolk_1.default();
             if (!yolk.yolkExists()) {
@@ -118,8 +116,9 @@ class Ovary {
                 const bleach = new bleach_1.default();
                 await bleach.clean(verbose);
             }
+            utils_2.default.warning('eggs will remove users accounts and datas from live');
             if (backup) {
-                console.log(`eggs will remove all users and services data from live. Following datas will included on a crypted LUKS volume:`);
+                console.log(`Follow users' data and accounts will be saved in a crypted LUKS volume:`);
                 const users = await this.usersFill();
                 for (let i = 0; i < users.length; i++) {
                     if (users[i].saveIt) {
@@ -134,9 +133,6 @@ class Ovary {
                     }
                 }
             }
-            else {
-                utils_2.default.warning('eggs will remove all the users data from live, but all services data will be included uncrypted');
-            }
             /**
              * NOTE: reCreate = false
              *
@@ -188,6 +184,8 @@ class Ovary {
             }
             if (backup) {
                 await (0, utils_1.exec)('eggs syncto', utils_2.default.setEcho(true));
+                utils_2.default.warning(`Waiting 10s, before to move ${luksFile} in ${this.settings.config.snapshot_dir}ovarium/iso/live`);
+                await (0, utils_1.exec)('sleep 10', utils_2.default.setEcho(false));
                 utils_2.default.warning(`moving ${luksFile} in ${this.settings.config.snapshot_dir}ovarium/iso/live`);
                 await (0, utils_1.exec)(`mv ${luksFile} ${this.settings.config.snapshot_dir}ovarium/iso/live`, this.echo);
             }
@@ -965,11 +963,10 @@ class Ovary {
          */
         // adapt
         if (myAddons.adapt) {
-            // if (Pacman.packageIsInstalled('lxde-core') || Pacman.packageIsInstalled('deepin-desktop-base') || Pacman.packageIsInstalled('mate-desktop') || Pacman.packageIsInstalled('ubuntu-mate-core') || Pacman.packageIsInstalled('xfce4')) {
             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/`);
-            // shx.cp(`${dirAddon}/bin/eggs-adapt.sh`, `${this.settings.work_dir.merged}/usr/local/bin/`)
-            // }
+            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`);
         }
         // ichoice
         if (myAddons.ichoice) {
@@ -978,6 +975,7 @@ class Ovary {
             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`);
         }
         // pve
         if (myAddons.pve) {