penguins-eggs 25.8.6 → 25.9.2

package/addons/eggs/theme/calamares/modules/users.yml

@@ -11,9 +11,9 @@ defaultGroups:
   - video
   - plugdev
   - netdev
-  # lpadmin
-  # scanner
-  # bluetooth
+  - lpadmin
+  - scanner
+  - bluetooth
 autologinGroup: autologin
 sudoersGroup: sudo
 setRootPassword: false

package/addons/eggs/theme/livecd/{grub.main.simple.cfg → grub.main.cfg}

@@ -1,18 +1,3 @@
-#
-# eggs: grub.main.cfg
-#
-if loadfont $prefix/font.pf2 ; then
-  set gfxmode=1024x768x32
-  insmod efi_gop
-  insmod efi_uga
-  insmod video_bochs
-  insmod video_cirrus
-  insmod gfxterm
-  insmod gfxterm_background
-  insmod jpeg
-  insmod png
-fi
-
 set theme=/boot/grub/theme.cfg
 
 menuentry "{{{fullname}}} Live/Installation" {
@@ -35,15 +20,10 @@ menuentry "{{{fullname}}} Text Mode" {
     linux {{{vmlinuz}}} {{{kernel_parameters}}} quiet splash
     initrd {{{initrdImg}}}
 }
-grub_platform
+
 if [ "$grub_platform" = "efi" ]; then
 menuentry "Boot from local disk" {
 	exit 1
 }
-#menuentry 'UEFI Firmware Settings' {
-#	fwsetup
-#}
-#menuentry 'Memory test' {
-#	linux	/boot/memtest.efi
-#}
 fi
+

package/assets/calamares/install-system.sh

@@ -19,8 +19,8 @@ export QT_AUTO_SCREEN_SCALE_FACTOR=1
 
 # Access control to run calamares as root for xwayland
 xhost +si:localuser:root
-pkexec env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY calamares
-#pkexec calamares
+#pkexec env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY calamares
+pkexec calamares
 xhost -si:localuser:root
 
 # Restore stale fstab, for what it's worth

package/conf/derivatives.yaml

@@ -40,6 +40,13 @@
     - orchid  # VanillaOS
     - gigi    #LMDE 7
 
+# forky
+- id: forky
+  distroLike: Debian
+  family: debian
+  ids:
+    - nobody  # for now
+
 #
 # DEVUAN
 #

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

@@ -1,25 +1,39 @@
-# Debian bookworm
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
 # Bootloader configuration. The bootloader is installed to allow
 # the system to start (and pick one of the installed operating
 # systems to run).
+#
+# Take note that Debian-derivatives that use unmodified GRUB EFI packages
+# should specifically set *efiBootloaderId* to "debian" because that is
+# hard-coded in `grubx64.efi`.
 ---
+# A variable from global storage which overrides the value of efiBootLoader
+#efiBootLoaderVar: "packagechooser_bootloader"
+
 # Define which bootloader you want to use for EFI installations
-# Possible options are 'grub', 'sb-shim' and 'systemd-boot'.
+# Possible options are 'grub', 'sb-shim', 'refind` and 'systemd-boot'.
 efiBootLoader: "grub"
 
-# systemd-boot configuration files settings, set kernel and initramfs file names
-# and amount of time before default selection boots
-kernel: "/vmlinuz-linux"
-img: "/initramfs-linux.img"
-fallback: "/initramfs-linux-fallback.img"
-timeout: "10"
+# systemd-boot configuration files settings
 
-# Optionally set the menu entry name and kernel name to use in systemd-boot.
-# If not specified here, these settings will be taken from branding.desc.
-#
-# bootloaderEntryName: "Generic GNU/Linux"
-# kernelLine: ", with Stable-Kernel"
-# fallbackKernelLine:  ", with Stable-Kernel (fallback initramfs)"
+# kernelSearchPath is the path relative to the root of the install to search for kernels
+# A kernel is identified by finding files which match regular expression, kernelPattern
+kernelSearchPath: "/usr/lib/modules"
+kernelPattern: "^vmlinuz.*"
+
+# loaderEntries is an array of options to add to loader.conf for systemd-boot
+# please note that the "default" option is added programmatically
+loaderEntries:
+  - "timeout 5"
+  - "console-mode keep"
+
+# systemd-boot and refind support custom kernel params
+kernelParams: [ "quiet" ]
+
+# A list of kernel names that refind should accept as kernels
+#refindKernelList: [ "linux","linux-lts","linux-zen","linux-hardened" ]
 
 # GRUB 2 binary names and boot directory
 # Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.
@@ -44,8 +58,21 @@ efiBootMgr: "efibootmgr"
 # setting the option here, keep in mind that the name is sanitized
 # (problematic characters, see above, are replaced).
 #
+# There are some special words possible at the end of *efiBootloaderId*:
+#   ${SERIAL} can be used to obtain a uniquely-numbered suffix
+#       that is added to the Id (yielding, e.g., `dirname1` or `dirname72`)
+#   ${RANDOM} can be used to obtain a unique 4-digit hex suffix
+#   ${PHRASE} can be used to obtain a unique 1-to-3-word suffix
+#       from a dictionary of space-themed words
+# These words must be at the **end** of the *efiBootloaderId* value.
+# There must also be at most one of them. If there is none, no suffix-
+# processing is done and the *efiBootloaderId* is used unchanged.
+#
+# NOTE: Debian derivatives that use the unmodified Debian GRUB EFI
+#       packages may need to set this to "debian" because that is
+#       hard-coded in `grubx64.efi`.
+#
 # efiBootloaderId: "dirname"
-efiBootloaderId: "Debian"
 
 # Optionally install a copy of the GRUB EFI bootloader as the EFI
 # fallback loader (either bootia32.efi or bootx64.efi depending on
@@ -53,5 +80,7 @@ efiBootloaderId: "Debian"
 # seems to be the only one). If you set this to false, take care
 # to add another module to optionally install the fallback on those
 # boards that need it.
-# NOTE: eggs unti calamres 3.2 was installEFIFallback: false
 installEFIFallback: true
+
+# Optionally install both BIOS and UEFI GRUB bootloaders.
+installHybridGRUB: false

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

@@ -1,48 +1,123 @@
-# Debian/Bookworm
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
 # Mount filesystems in the target (generally, before treating the
 # target as a usable chroot / "live" system). Filesystems are
 # automatically mounted from the partitioning module. Filesystems
 # listed here are **extra**. The filesystems listed in *extraMounts*
-# are mounted in all target systems. The filesystems listed in
-# *extraMountsEfi* are mounted in the target system **only** if
-# the host machine uses UEFI.
+# are mounted in all target systems.
 ---
 # Extra filesystems to mount. The key's value is a list of entries; each
-# entry has four keys:
+# entry has five keys:
 #   - device    The device node to mount
-#   - fs        The filesystem type to use
+#   - fs (optional) The filesystem type to use
 #   - mountPoint Where to mount the filesystem
-#   - options (optional) Extra options to pass to mount(8)
+#   - options (optional) An array of options to pass to mount
+#   - efi (optional) A boolean that when true is only mounted for UEFI installs
+#
+# The device is not mounted if the mountPoint is unset or if the fs is
+# set to unformatted.
 #
 extraMounts:
-  - device: proc
-    fs: proc
-    mountPoint: /proc
-  - device: sys
-    fs: sysfs
-    mountPoint: /sys
-  - device: /dev
-    mountPoint: /dev
-    options: {{{options}}}
-  - device: tmpfs
-    fs: tmpfs
-    mountPoint: /run
-  - device: /run/udev
-    mountPoint: /run/udev
-    options: {{{options}}}
-
-extraMountsEfi:
-  - device: efivarfs
-    fs: efivarfs
-    mountPoint: /sys/firmware/efi/efivars
+    - device: proc
+      fs: proc
+      mountPoint: /proc
+    - device: sys
+      fs: sysfs
+      mountPoint: /sys
+    - device: /dev
+      mountPoint: /dev
+      options: {{{options}}}      
+    - device: tmpfs
+      fs: tmpfs
+      mountPoint: /run
+    - device: /run/udev
+      mountPoint: /run/udev
+      options: {{{options}}}
+    - device: efivarfs
+      fs: efivarfs
+      mountPoint: /sys/firmware/efi/efivars
+      efi: true
 
-# added from spiralLinux, updated
+# Btrfs subvolumes to create if root filesystem is on btrfs volume.
+# If *mountpoint* is mounted already to another partition, it is ignored.
+# Separate subvolume for swapfile is handled separately and automatically.
+#
+# It is possible to prevent subvolume creation -- this is likely only relevant
+# for the root (/) subvolume -- by giving an empty string as a subvolume
+# name. In this case no subvolume will be created.
+#
 btrfsSubvolumes:
     - mountPoint: /
       subvolume: /@
+      # As an alternative:
+      #
+      # subvolume: ""
     - mountPoint: /home
       subvolume: /@home
     - mountPoint: /var/cache
       subvolume: /@cache
     - mountPoint: /var/log
       subvolume: /@log
+
+# The name of the btrfs subvolume holding the swapfile.  This only used when
+# a swapfile is selected and the root filesystem is btrfs
+#
+btrfsSwapSubvol: /@swap
+
+# The mount options used to mount each filesystem.
+#
+# filesystem contains the name of the filesystem or on of three special
+# values, "default", efi" and "btrfs_swap".  The logic is applied in this manner:
+#   - If the partition is the EFI partition, the "efi" entry will be used
+#   - If the fs is btrfs and the subvolume is for the swapfile,
+#     the "btrfs_swap" entry is used
+#   - If the  filesystem is an exact match for filesystem, that entry is used
+#   - If no match is found in the above, the default entry is used
+#   - If there is no match and no default entry, "defaults" is used
+#   - If the mountOptions key is not present, "defaults" is used
+#
+# Each filesystem entry contains 3 keys, all of which are optional
+#   options - An array of mount options that is used on all disk types
+#   ssdOptions - An array of mount options combined with options for ssds
+#   hddOptions - An array of mount options combined with options for hdds
+# If combining these options results in an empty array, "defaults" is used
+#
+# Example 1
+# In this example, there are specific options for ext4 and btrfs filesystems,
+# the EFI partition and the subvolume holding the btrfs swapfile.  All other
+# filesystems use the default entry.  For the btrfs filesystem, there are
+# additional options specific to hdds and ssds
+#
+# mountOptions:
+#    - filesystem: default
+#      options: [ defaults ]
+#    - filesystem: efi
+#      options: [ defaults, umask=0077 ]
+#    - filesystem: ext4
+#      options: [ defaults ]
+#    - filesystem: btrfs
+#      options: [ defaults, compress=zstd:1 ]
+#      ssdOptions: [ discard=async ]
+#      hddOptions: [ autodefrag ]
+#    - filesystem: btrfs_swap
+#      options: [ defaults, noatime ]
+#
+# Example 2
+# In this example there is a single default used by all filesystems
+#
+# mountOptions:
+#    - filesystem: default
+#      options: [ defaults ]
+#
+mountOptions:
+    - filesystem: default
+      options: [ defaults ]
+    - filesystem: efi
+      options: [ defaults, umask=0077 ]
+    - filesystem: btrfs
+      options: [ defaults, compress=zstd:1 ]
+    - filesystem: btrfs_swap
+      options: [ defaults, noatime ]
+
+

package/dist/classes/distro.js

@@ -158,7 +158,7 @@ class Distro {
                 this.liveMediumPath = '/run/archiso/bootmnt/';
                 this.squashfs = `arch/x86_64/airootfs.sfs`;
                 /**
-                 * Debian jessie
+                 * Debian 8 jessie
                  */
             }
             else if (this.codenameId === 'jessie') {
@@ -167,7 +167,7 @@ class Distro {
                 this.liveMediumPath = '/lib/live/mount/medium/';
                 this.isCalamaresAvailable = false;
                 /**
-                 * Debian stretch
+                 * Debian 9 stretch
                  */
             }
             else if (this.codenameId === 'stretch') {
@@ -176,33 +176,41 @@ class Distro {
                 this.liveMediumPath = '/lib/live/mount/medium/';
                 this.isCalamaresAvailable = false;
                 /**
-                 * Debian buster
+                 * Debian 10 buster
                  */
             }
             else if (this.codenameId === 'buster') {
                 this.distroLike = 'Debian';
                 this.codenameLikeId = 'buster';
                 /**
-                 * Debian bullseye
+                 * Debian 11 bullseye
                  */
             }
             else if (this.codenameId === 'bullseye') {
                 this.distroLike = 'Debian';
                 this.codenameLikeId = 'bullseye';
                 /**
-                 * Debian bookworm
+                 * Debian 12 bookworm
                  */
             }
             else if (this.codenameId === 'bookworm') {
                 this.distroLike = 'Debian';
                 this.codenameLikeId = 'bookworm';
                 /**
-                 * Debian trixie
+                 * Debian 13 trixie
                  */
             }
             else if (this.codenameId === 'trixie') {
                 this.distroLike = 'Debian';
                 this.codenameLikeId = 'trixie';
+                this.liveMediumPath = '/run/live/medium/';
+                /**
+                 * Debian 14 forky
+                 */
+            }
+            else if (this.codenameId === 'forky') {
+                this.distroLike = 'Debian';
+                this.codenameLikeId = 'forky';
                 /**
                  * Devuan beowulf
                  */

package/dist/classes/diversions.d.ts

@@ -49,4 +49,5 @@ export default class Diversions {
     * isManjaroBased
     */
     static isManjaroBased(distro: string): boolean;
+    static bootloaders(familyId: string): string;
 }

package/dist/classes/diversions.js

@@ -123,4 +123,11 @@ export default class Diversions {
         }
         return found;
     }
+    static bootloaders(familyId) {
+        let bootloaders = '/usr/lib/';
+        if (familyId !== 'debian') {
+            bootloaders = '/usr/lib/penguins-eggs/bootloaders/';
+        }
+        return bootloaders;
+    }
 }

package/dist/classes/incubation/incubator.d.ts

@@ -41,4 +41,8 @@ export default class Incubator {
      *
      */
     private createInstallerDirs;
+    /**
+     * soluzione tampone from Glenn
+     */
+    private sudoers;
 }

package/dist/classes/incubation/incubator.js

@@ -69,6 +69,7 @@ export default class Incubator {
         Utils.warning(`creating ${installer().name} configuration files on ${installer().configRoot}`);
         this.createInstallerDirs();
         this.createBranding();
+        this.sudoers();
         const codenameLikeId = this.distro.codenameLikeId;
         try {
             /**
@@ -111,6 +112,10 @@ export default class Incubator {
             else if (codenameLikeId === 'trixie') {
                 const trixie = new Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.isClone, this.verbose);
                 await trixie.create();
+            }
+            else if (codenameLikeId === 'forky') {
+                const forky = new Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.isClone, this.verbose);
+                await forky.create();
                 /**
                  * Devuan
                  */
@@ -349,6 +354,15 @@ export default class Incubator {
         shx.cp(path.resolve(__dirname, '../../../assets/calamares/install-system.sh'), '/usr/sbin/install-system.sh');
         shx.chmod('+x', '/usr/sbin/install-system.sh');
     }
+    /**
+     * soluzione tampone from Glenn
+     */
+    sudoers() {
+        let live = 'live';
+        let content = `${live} ALL=(ALL) NOPASSWD: /usr/bin/calamares`;
+        let fname = '/etc/sudoers.d/calamares';
+        fs.writeFileSync(fname, content, 'utf-8');
+    }
 }
 /**
  *

package/dist/classes/ovary.d/bind-live-fs.js

@@ -64,7 +64,7 @@ export async function bindLiveFs() {
                     cmds.push(`# /${dir} is copied if not exists on filesystem.squashfs`);
                     let chkDir = path.join(this.settings.config.snapshot_mnt, 'filesystem.squashfs', dir);
                     cmds.push(`if ! [ -d "${chkDir}" ]; then`);
-                    cmds.push(await rexec(`   cp -r /${dir} ${this.settings.config.snapshot_mnt}filesystem.squashfs`, this.verbose));
+                    cmds.push(await rexec(`   cp -a /${dir} ${this.settings.config.snapshot_mnt}filesystem.squashfs`, this.verbose));
                     cmds.push(`fi`);
                     continue;
                 }
@@ -99,7 +99,7 @@ export async function bindLiveFs() {
                 cmds.push('# file exist... skip');
             }
             else {
-                cmds.push(await rexec(`cp /${dir} ${this.settings.work_dir.merged}`, this.verbose));
+                cmds.push(await rexec(`cp -p /${dir} ${this.settings.work_dir.merged}`, this.verbose));
             }
         }
         cmds.push(endLine);

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

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

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

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

package/dist/classes/ovary.d/live-create-structure.js

@@ -29,7 +29,7 @@ export async function liveCreateStructure() {
         tryCatch(cmd, this.verbose);
     }
     if (!fs.existsSync(this.settings.config.snapshot_dir + '/README.md')) {
-        cmd = `cp ${path.resolve(__dirname, '../../conf/README.md')} ${this.settings.config.snapshot_dir}README.md`;
+        cmd = `cp ${path.resolve(__dirname, '../../../conf/README.md')} ${this.settings.config.snapshot_dir}README.md`;
         tryCatch(cmd, this.verbose);
     }
     // Ovarium

package/dist/classes/ovary.d/make-dot-disk.js

@@ -24,12 +24,24 @@ export function makeDotDisk(info = '', mksquashfs = '', mkisofs = '') {
         shx.rm('-rf', dotDisk);
     }
     shx.mkdir('-p', dotDisk);
-    let text = `# Created at: ${Utils.formatDate(new Date())}\n`;
-    text += `# penguins_eggs v. ${Utils.getPackageVersion()}\n`;
     /**
-     * write test as .disk/info
+     * write volid .disk/info
+     * Required
      */
-    fs.writeFileSync(path.join(dotDisk, 'info'), text, 'utf-8');
+    let volidContent = this.settings.isoFilename;
+    fs.writeFileSync(path.join(dotDisk, 'info'), volidContent, 'utf-8');
+    /**
+     * A readme now replace the old .disk/info
+     */
+    let readme = ``;
+    readme += `# penguins_eggs\n`;
+    readme += `\n`;
+    readme += `Volinfo: ${this.volid}\n`;
+    readme += `Image created at: ${Utils.formatDate(new Date())} using penguins_eggs v. ${Utils.getPackageVersion()})\n`;
+    readme += `repo: [penguins-eggs](https://github.com/penguins-eggs)\n`;
+    readme += `blog: [penguins-eggs.net](https://penguins-eggs.net)\n`;
+    readme += `author: [Piero Proietti](mailto://piero.proietti@gmail.com)\n`;
+    fs.writeFileSync(path.join(dotDisk, 'README.md'), readme, 'utf-8');
     /**
      * write mksquashfs as .disk/mksquashfs
      */

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

@@ -10,7 +10,5 @@ import Ovary from '../ovary.js';
  *
  * @param this
  * @param theme
- * cp /usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed ./bootloaders/
- * cp /usr/lib/shim/shimx64.efi.signed ./bootloaders/
  */
 export declare function makeEfi(this: Ovary, theme?: string): Promise<void>;