penguins-eggs 9.1.37 → 9.2.4

package/addons/eggs/theme/livecd/isolinux.theme.cfg

@@ -1,46 +1,41 @@
 #
 # eggs: isolinux.theme
 #
-MENU TITLE Penguin's eggs - Perri's brewery edition
-MENU BACKGROUND splash.png
+menu color screen       *   #80ffffff #00000000 none
+menu color border       *   #40000000 #00000000 none
+menu color title        *   #ffffffff #429ad6   none
+menu color sel          *   #fffafafa #ff4dd0e1 none
+menu color unsel        *   #ff231f20 #00000000 none
+menu color hotsel       *   #e0400000 #20ff8000 none
+menu color disabled     *   #60cccccc #00000000 none
+menu color scrollbar    *   #40000000 #00000000 none
+menu color tabmsg       *   #0808ea   #ffffffff none
+menu color cmdline      *   #ff231f20 #ffffffff none
+menu color cmdmark      *   #c000ffff #00000000 none
+menu color pwdborder    *   #80ffffff #20ffffff none
+menu color pwdheader    *   #80ff8080 #20ffffff none
+menu color pwdentry     *   #80ffffff #20ffffff none
+menu color timeout_msg  *   #80ffffff #00000000 none
+menu color timeout      *   #c0ffffff #00000000 none
+menu color help         *   #c0ffffff #00000000 none
+menu color msg07        *   #ffffffff #00000000 none
 
-# MENU COLOR element backgound foreground shadow
-# background and foreground are hexadecimal digits for alpha (opacity), red, green and blue,
-# respectively. #00000000 represents fully transparent, and #ffffffff represents opaque white.
-# shadow none/std
-MENU COLOR screen	    37;40      #80ffffff #00000000 std
-MENU COLOR border	    30;44      #40000000 #00000000 std
-MENU COLOR title	    1;36;44    #c00090f0 #00000000 std
-MENU COLOR unsel	    37;44      #90ffffff #00000000 std
-MENU COLOR sel  	    7;37;40    #e0000000 #20ff8000 all
-MENU COLOR hotsel	    1;7;37;40  #e0400000 #20ff8000 all
-MENU COLOR disabled	    1;30;44    #60cccccc #00000000 std
-MENU COLOR scrollbar	30;44      #40000000 #00000000 std
-MENU COLOR tabmsg	    31;40      #90ffff00 #00000000 std
-MENU COLOR cmdmark	    1;36;40    #c000ffff #00000000 std
-MENU COLOR cmdline	    37;40      #c0ffffff #00000000 std
-MENU COLOR pwdborder	30;47      #80ffffff #20ffffff std
-MENU COLOR pwdheader	31;47      #80ff8080 #20ffffff std
-MENU COLOR pwdentry	    30;47      #80ffffff #20ffffff std
-MENU COLOR timeout_msg	37;40      #80ffffff #00000000 std
-MENU COLOR timeout	    1;37;40    #c0ffffff #00000000 std
-MENU COLOR help 	    37;40      #c0ffffff #00000000 std
-MENU COLOR msg07	    37;40      #90ffffff #00000000 std
 
-# POSIZIONE
-MENU WIDTH 80
-MENU MARGIN 10
-MENU PASSWORDMARGIN 3
-MENU ROWS 12
-MENU TABMSGROW 18
-MENU CMDLINEROW 18
-MENU ENDROW -1
-MENU PASSWORDROW 11
-MENU TIMEOUTROW 20
-MENU HELPMSGROW 22
-MENU HELPMSGENDROW -1
-MENU HIDDENROW -2
-MENU HSHIFT 0
-MENU VSHIFT 0
-
-MENU tabmsg Press ENTER to boot or TAB to edit a menu entry
+# Position
+menu width  80
+menu margin 10
+#menu passwordmargin 3
+menu rows 12
+menu tabmsgrow 18
+menu cmdlinegrow 18
+menu endrow -1
+menu passwordrow 11
+menu timeout 20
+menu helpmsggrow 22
+menu helpmsgendrow  -1
+menu hiddenrow -2
+menu hshift 0
+menu vshift 0
+menu title Penguin's eggs - Perri's brewery edition
+menu background splash.png
+menu tabmsg Press ENTER to boot or TAB to edit a menu entry

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

@@ -11,7 +11,7 @@ sequence:
       - locale
       - keyboard
       - partition
-      - users
+      {{createUsers}}users
       - summary
   - exec:
       - partition
@@ -24,7 +24,7 @@ sequence:
       - keyboard
       - localecfg
       - luksbootkeyfile
-      - users
+      {{createUsers}}users
       {{hasDisplaymanager}}displaymanager
       - networkcfg
       - hwclock

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

@@ -52,7 +52,7 @@ sequence:
       - locale
       - keyboard
       - partition
-      - users
+      {{createUsers}}users
       - summary
 
   # Phase 2 - install.
@@ -72,7 +72,7 @@ sequence:
       - locale
       - keyboard
       - localecfg
-      - users
+      {{createUsers}}users
       {{hasDisplaymanager}}displaymanager 
       - networkcfg
       - hwclock

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

@@ -28,7 +28,7 @@ sequence:
       - locale
       - keyboard
       - partition
-      - users
+      {{createUsers}}users
       - summary
   - exec:
       - partition
@@ -41,7 +41,7 @@ sequence:
       - keyboard
       - localecfg
       - luksbootkeyfile
-      - users
+      {{createUsers}}users
       {{hasDisplaymanager}}displaymanager
       - networkcfg
       - hwclock

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

@@ -0,0 +1,4 @@
+---
+systemd: true
+dbus: true
+symlink: true

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

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

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

@@ -0,0 +1,6 @@
+--
+dontChroot: false
+timeout: 30
+script:
+    - "rm -r @@ROOT@@/usr/share/applications/install-debian.desktop"
+   

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

@@ -18,7 +18,7 @@ sequence:
       - locale
       - keyboard
       - partition
-      - users
+      {{createUsers}}users
       - summary
 
   # Phase 2 - install.
@@ -31,29 +31,22 @@ sequence:
       - partition
       - mount
       - unpackfs
-      # sources-yolk
-      #{{hasSystemd}}machineid
+      - machineid
       - fstab
       - locale
       - keyboard
       - localecfg
-      - users
+      {{createUsers}}users
       {{hasDisplaymanager}}displaymanager 
       - networkcfg
       - hwclock
-      #{{hasSystemd}}services-systemd 
-      #- bootloader-config
       - grubcfg
       - bootloader
       - packages
       - luksbootkeyfile
       - plymouthcfg
-      #- initramfscfg
-      #- initramfs
       - removeuser
-      #- shellprocess@cleanup
-      #- remove-link
-      #- sources-yolk-unmount
+      # shellprocess removelink
       - umount
 
   # Phase 3 - postinstall.

package/conf/eggs.yaml

@@ -1,100 +1,68 @@
 # Penguin's eggs
 # eggs.yaml
 ---
-# version
-version: '16.*.*'
-
-# You can change the location of 'snapshot_dir' (location of final iso file) 
-# in case you don't have enough space on the system. 
-# default: /home/eggs
-snapshot_dir: '/home/eggs/'
-
-# The name of the snapshot file will be hostname-{arch}_{yyyy-mm-dd_hhmm}.iso.
-# If you'd like to replace "hostname" with something different,
-# change it here. (example: snapshot_basename="my-buster-live")
-#
-# prefix iso file
-# You can choose a prefix like 'UfficioZero_'
-# default ''
+version: '' 
+
+# eggs nest, default: /home/eggs
+snapshot_dir: /home/eggs/
+
+# Default '', dad -d put it at egg-of-distro-version-
 snapshot_prefix: ''
 
-# Note: hostname use the name of the host
-#
-# default hostname
-snapshot_basename: 'hostname'
+# You can edit this rsync excludes file
+snapshot_excludes: /usr/local/share/penguins-eggs/exclude.list
 
-# You can change the rsync excludes file here - if you know what you're doing -
-# be sure to use the full path to the file.
-#
-# default /var/local/share/excludes/penguins-eggs-snapshot-exclude.list
-snapshot_excludes: '/var/local/share/penguins-eggs/exclude.list'
+# snapshot_basename, default: ''
+snapshot_basename: ''
 
-# user to be used in the liveCd
-# default live
-user_opt: 'live'
+# user liveCD, default: live
+user_opt: live
 
-# password of user to be used in the liveCd
-# default evolution
-user_opt_passwd: 'evolution'
+# user liveCD password, default: evolution
+user_opt_passwd: evolution
 
-# root password to be used in liveCd
-# default evolution
-root_passwd: 'evolution'
+# root liveCD password, default: evolution
+root_passwd: evolution
 
-# theme to be used as default
-# default: eggs
-theme: ''
+# theme to be used, default: eggs
+theme: eggs
 
-# Force installation package calamares if is not already installed.
-# default no if calamares is not installed 
-force_installer: false
+# Ask for installation calamares
+force_installer: true
 
-# Set to true to create boot files for uefi.
-# default true if grub_efi_amd64 package is installed
-make_efi: false
+# make_efi, default: true
+make_efi: true
 
-# Change to false if you don't want the md5sum file created with the iso.
-# default yes
+# Create md5sum file, default true
 make_md5sum: true
 
-# Change to fale if you want a plain iso image instead of isohybrid.
-# Default true
+# make_isohybrid, default true
 make_isohybrid: true
 
-# Compression algorithm
-# Allowed values are, in order of speed-size tradeoff: lz4, lzo, gzip, xz  
-# default -Xcompression-level 20
-compression: '-Xcompression-level 20'
+# Compression algorithm, default xz
+compression: xz
 
 # Allow password login to ssh for users (not root).
-# If ssh_pass=true, then PasswordAuthentication will be set to true
-# If ssh_pass=false, then PasswordAuthentication will be set to false
-# In either of the above cases, if PermitRootLogin was set to true,
-# it will be changed to "prohibit-password" (meaning with auth keys only)
-# default true
 ssh_pass: true
 
-
-
-# timezone 
+# timezone
 timezone: Europe/Rome
 
-# locales to be builded
+# locales_default, default env.LANG or en_US.UTF-8
+locales_default: 
+
+# locales, default: locales_default + en_US.UTF-8
 locales:
-  - it_IT.UTF-8
+  - en_US.UTF-8
+
+# it's still used?
+pmount_fixed: false
 
-# default locales
-locales_default: it_IT.UTF-8
+# machine_id: default /etc/machine-id
+machine_id: ''
 
-# keyboard
-keyboard:
-  XkbModel: "pc105"
-  XkbLayout: "it"
-  XkbVariant: ""
-  XkbOptions: ""
+# vmlinuz, default: /path/to/vmlinuz
+vmlinuz: ''
 
-##
-# The following fields are actually not used in eggs
-pmount_fixed: false
-netconfig_opt: ''
-ifnames_opt: ''
+# initrd_img, default: /path/to/initrd_img
+initrd_img: ''

package/conf/exclude.list

@@ -32,6 +32,7 @@
 - /etc/crypttab
 - /etc/fstab
 - /etc/fstab.d/*
+- /etc/dnsmasq.d/cuckoo.conf
 - /etc/initramfs-tools/conf.d/resume     # see remove-cryptroot and nocrypt.sh
 - /etc/initramfs-tools/conf.d/cryptroot  # see remove-cryptroot and nocrypt.sh
 - /etc/machine-id

package/conf/krill.yaml

@@ -0,0 +1,38 @@
+# Penguin's eggs
+# krill.yaml
+---
+# welcome (put your language, example: it_IT.UTF-8)
+language: 'en_US.UTF-8'
+
+# location (put your location, example region: "Europe", zone: "Rome")
+region: 'America'
+zone: 'New_York'
+
+# keyboard (put your values example: keyboardModel: "pc105", keyboardLayout: "it")
+keyboardModel: 'pc105'
+keyboardLayout: 'us'
+keyboardVariant: ''
+keyboardOption: ''
+
+# partition (leave it unchanged)
+installationDevice: ''
+installationMode: 'standard'
+filesystemType: 'ext4'
+userSwapChoice: 'small'
+
+# users (Here you can put your default user, password, etc)
+name: 'artisan'
+fullname: 'artisan'
+password: 'evolution'
+rootPassword: 'evolution'
+autologin: true
+hostname: ''
+
+# network (leave it unchanged)
+iface: ""
+addressType: 'dhcp'
+address: ''
+netmask: ''
+gateway: ''
+domain: ''
+dns: ''

package/lib/classes/bleach.js

@@ -22,12 +22,15 @@ class Bleach {
      * @param verbose
      */
     async clean(verbose = false) {
+        if (verbose) {
+            utils_1.default.warning('cleaning the system');
+        }
         const distro = new distro_1.default();
-        if (distro.distroLike === 'Debian' || distro.distroLike === 'Devuan' || (distro.distroLike === 'Ubuntu')) {
+        if (distro.familyId === 'debian') {
             await this.cleanApt(verbose);
         }
-        else if (distro.distroLike === 'Arch') {
-            await (0, utils_2.exec)('paccache -ruk0');
+        else if (distro.familyId === 'archlinux') {
+            await (0, utils_2.exec)('pacman -Scc', utils_1.default.setEcho(true));
         }
         await this.cleanHistory(verbose);
         await this.cleanJournal(verbose);
@@ -41,7 +44,6 @@ class Bleach {
         let echo = { echo: false, ignore: true, capture: false };
         if (verbose) {
             echo = { echo: true, ignore: true, capture: false };
-            utils_1.default.warning('cleaning apt');
         }
         await (0, utils_2.exec)('apt-get clean', echo);
         await (0, utils_2.exec)('apt-get autoclean', echo);

package/lib/classes/daddy.d.ts

@@ -1,5 +1,5 @@
 import Settings from '../classes/settings';
-import { IConfig } from '../interfaces';
+import { IEggsConfig } from '../interfaces';
 export default class Daddy {
     settings: Settings;
     helpMe(loadDefault?: boolean, verbose?: boolean): Promise<void>;
@@ -7,5 +7,5 @@ export default class Daddy {
      *
      * @param c
      */
-    editConfig(c: IConfig): Promise<string>;
+    editConfig(c: IEggsConfig): Promise<string>;
 }

package/lib/classes/daddy.js

@@ -102,13 +102,14 @@ class Daddy {
                 const myAddons = {};
                 myAddons.adapt = true;
                 const backup = false;
+                const personal = false;
                 const scriptOnly = false;
                 const yolkRenew = false;
                 const final = false;
                 const ovary = new ovary_1.default();
                 utils_1.default.warning('Produce an egg...');
                 if (await ovary.fertilization(config.snapshot_prefix, config.snapshot_basename, config.theme, config.compression)) {
-                    await ovary.produce(backup, scriptOnly, yolkRenew, final, myAddons, verbose);
+                    await ovary.produce(backup, personal, scriptOnly, yolkRenew, final, myAddons, verbose);
                     ovary.finished(scriptOnly);
                 }
             }

package/lib/classes/distro.d.ts

@@ -19,6 +19,8 @@ declare class Distro implements IDistro {
     usrLibPath: string;
     isolinuxPath: string;
     syslinuxPath: string;
+    pxelinuxPath: string;
+    liveMediumPath: string;
     mountpointSquashFs: string;
     homeUrl: string;
     supportUrl: string;

package/lib/classes/distro.js

@@ -27,6 +27,10 @@
  * Ubuntu 21.10 (impish) active
  * Ubuntu 22.04 (jammy) LTS
  *
+ * Arch
+ * Manjaro Qonos
+ * Manjaro Ruah
+ *
  */
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -48,6 +52,8 @@ class Distro {
         this.usrLibPath = '/usr/lib';
         this.isolinuxPath = '';
         this.syslinuxPath = '';
+        this.pxelinuxPath = '';
+        this.liveMediumPath = `/run/live/medium/`;
         this.mountpointSquashFs = '';
         this.homeUrl = '';
         this.supportUrl = '';
@@ -113,12 +119,14 @@ class Distro {
                 // Debian 8 jessie
                 this.distroLike = 'Debian';
                 this.codenameLikeId = 'jessie';
+                this.liveMediumPath = '/lib/live/mount/medium/';
                 break;
             }
             case 'stretch': {
                 // Debian 9 stretch
                 this.distroLike = 'Debian';
                 this.codenameLikeId = 'stretch';
+                this.liveMediumPath = '/lib/live/mount/medium/';
                 break;
             }
             case 'buster': {
@@ -164,6 +172,7 @@ class Distro {
                 // Ubuntu 18.04 bionic LTS eol aprile 2023
                 this.distroLike = 'Ubuntu';
                 this.codenameLikeId = 'bionic';
+                this.liveMediumPath = '/lib/live/mount/medium/';
                 break;
             }
             case 'focal': {
@@ -381,6 +390,7 @@ class Distro {
             case 'debian': {
                 this.isolinuxPath = '/usr/lib/ISOLINUX/';
                 this.syslinuxPath = '/usr/lib/syslinux/modules/bios/';
+                this.pxelinuxPath = '/usr/lib/PXELINUX/';
                 this.usrLibPath = '/usr/lib/x86_64-linux-gnu/';
                 if (process.arch === 'ia32') {
                     this.usrLibPath = '/usr/lib/i386-linux-gnu/';

package/lib/classes/family/archlinux.js

@@ -36,8 +36,12 @@ class Archlinux {
      * Crea array pacchetti da installare/rimuovere
      */
     static packages(remove = false, verbose = false) {
+        /**
+         * praticamente non serve, perche prende dal pacchetto o da pkgbuild
+         */
         // 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'];
+        // 'pacman', 'awk', 'dosfstools'
+        const packages = ['']; // 'arch-install-scripts',  'e2fsprogs', 'erofs-utils', 'findutils', 'gzip', 'libarchive', 'libisoburn', 'mtools', 'openssl', 'rsync', 'sed', 'syslinux', 'squashfs-tools']
         const toInstall = [];
         const toRemove = [];
         for (const elem of packages) {
@@ -97,12 +101,12 @@ class Archlinux {
     static async calamaresInstall(verbose = false) {
         verbose = true; // serve per pacman
         const echo = utils_1.default.setEcho(verbose);
+        let cmd = `pacman -Sy --noconfirm ${(0, dependencies_1.array2spaced)(this.packs4calamares)}`;
         try {
-            // inserito flag --noconfirm
-            await (0, utils_2.exec)(`pacman -Sy --noconfirm ${(0, dependencies_1.array2spaced)(this.packs4calamares)}`, echo);
+            await (0, utils_2.exec)(cmd, echo);
         }
         catch {
-            utils_1.default.error(`Archlinux.calamaresInstall() pacman -Sy ${(0, dependencies_1.array2spaced)(this.packs4calamares)}`); // + e.error)
+            utils_1.default.error(`Archlinux.calamaresInstall(): ${cmd}`); // + e.error)
         }
     }
     /**

package/lib/classes/incubation/distros/bionic.d.ts

@@ -21,7 +21,7 @@ export declare class Bionic {
      * @param release
      * @param verbose
      */
-    constructor(installer: IInstaller, remix: IRemix, distro: IDistro, release: boolean, user_opt: string, verbose?: boolean);
+    constructor(installer: IInstaller, remix: IRemix, distro: IDistro, user_opt: string, release?: boolean, verbose?: boolean);
     /**
      *
      */

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

@@ -19,7 +19,7 @@ class Bionic {
      * @param release
      * @param verbose
      */
-    constructor(installer, remix, distro, release, user_opt, verbose = false) {
+    constructor(installer, remix, distro, user_opt, release = false, verbose = false) {
         this.verbose = false;
         this.installer = {};
         this.release = false;

package/lib/classes/incubation/distros/buster.d.ts

@@ -23,7 +23,7 @@ export declare class Buster {
      * @param displaymanager
      * @param verbose
      */
-    constructor(installer: IInstaller, remix: IRemix, distro: IDistro, release: boolean, user_opt: string, verbose?: boolean);
+    constructor(installer: IInstaller, remix: IRemix, distro: IDistro, user_opt: string, release?: boolean, verbose?: boolean);
     /**
      *
      */

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

@@ -21,7 +21,7 @@ class Buster {
      * @param displaymanager
      * @param verbose
      */
-    constructor(installer, remix, distro, release, user_opt, verbose = false) {
+    constructor(installer, remix, distro, user_opt, release = false, verbose = false) {
         this.verbose = false;
         this.installer = {};
         this.release = false;

package/lib/classes/incubation/distros/focal.d.ts

@@ -21,7 +21,7 @@ export declare class Focal {
      * @param displaymanager
      * @param verbose
      */
-    constructor(installer: IInstaller, remix: IRemix, distro: IDistro, release: boolean, user_opt: string, verbose?: boolean);
+    constructor(installer: IInstaller, remix: IRemix, distro: IDistro, user_opt: string, release?: boolean, verbose?: boolean);
     /**
      *
      */

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

@@ -19,7 +19,7 @@ class Focal {
      * @param displaymanager
      * @param verbose
      */
-    constructor(installer, remix, distro, release, user_opt, verbose = false) {
+    constructor(installer, remix, distro, user_opt, release = false, verbose = false) {
         this.verbose = false;
         this.installer = {};
         this.release = false;