penguins-eggs 25.9.14 → 25.9.24

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

@@ -1,56 +1,121 @@
-# 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}}}
+    - device: proc
+      fs: proc
+      mountPoint: /proc
+    - device: sys
+      fs: sysfs
+      mountPoint: /sys
+    - device: /dev
+      mountPoint: /dev
+      options: [ bind ]
+    - device: tmpfs
+      fs: tmpfs
+      mountPoint: /run
+    - device: /run/udev
+      mountPoint: /run/udev
+      options: [ bind ]
+    - device: efivarfs
+      fs: efivarfs
+      mountPoint: /sys/firmware/efi/efivars
+      efi: true
 
-extraMountsEfi:
-  - device: efivarfs
-    fs: efivarfs
-    mountPoint: /sys/firmware/efi/efivars
-
-# added from spiralLinux
+# 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: /@
-    - mountPoint: /.snapshots
-      subvolume: /@snapshots
+      # As an alternative:
+      #
+      # subvolume: ""
     - mountPoint: /home
       subvolume: /@home
-    - mountPoint: /root
-      subvolume: /@root
+    - mountPoint: /var/cache
+      subvolume: /@cache
     - mountPoint: /var/log
-      subvolume: /@var@log
-    - mountPoint: /var/lib/AccountsService
-      subvolume: /@var@lib@AccountsService
-    - mountPoint: /var/lib/blueman
-      subvolume: /@var@lib@blueman
-    - mountPoint: /tmp
-      subvolume: /@tmp
+      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/conf/distros/alpine/calamares/settings.yml

@@ -47,7 +47,7 @@ sequence:
       - locale
       - keyboard
       - partition
-      {{createUsers}}users
+      - users
       - summary
 
   # Phase 2 - install.
@@ -64,8 +64,8 @@ sequence:
     - fstab
     - locale
     - keyboard
-    {{createUsers}}users
-    {{hasDisplaymanager}}displaymanager
+    - users
+    - displaymanager
     - networkcfg
     - hwclock
     - services-openrc
@@ -91,7 +91,7 @@ sequence:
 # Only the name of the branding component (directory) should be
 # specified here, Calamares then takes care of finding it and
 # loading the contents.
-branding: {{branding}}
+branding: default
 
 # If this is set to true, Calamares will show an "Are you sure?" prompt right
 # before each execution phase, i.e. at points of no return. If this is set to

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

@@ -11,21 +11,21 @@ sequence:
       - locale
       - keyboard
       - partition
-      {{createUsers}}users
+      - users
       - summary
   - exec:
       - partition
       - mount
       - unpackfs
       - sources-yolk
-      {{hasSystemd}}machineid
+      - machineid
       - fstab
       - locale
       - keyboard
       - localecfg
       - luksbootkeyfile
-      {{createUsers}}users
-      {{hasDisplaymanager}}displaymanager
+      - users
+      - displaymanager
       - networkcfg
       - hwclock
       #- before-bootloader-mkdirs
@@ -44,7 +44,7 @@ sequence:
       - umount
   - show:
       - finished
-branding: {{branding}}
+branding: default
 prompt-install: true
 dont-chroot: false
 oem-setup: false

package/conf/distros/buster/calamares/libexec/README.md

@@ -0,0 +1,5 @@
+# penguins-eggs
+
+Contains scripts for calamares, which are copied to `/usr/libexec/calamares`.
+
+The creation of `/usr/libexec/calamares` and its population should be done by `eggs calamares --install`, while `eggs calamares --remove` should ensure its removal.

package/conf/distros/{noble/calamares/modules/focal-jammy/mount.yml → buster/calamares/modules/mount.3.2.yml}

@@ -1,4 +1,4 @@
-# Ubuntu focal-20.04
+# calamares 3.2.x
 ---
 extraMounts:
     - device: proc
@@ -9,15 +9,12 @@ extraMounts:
       mountPoint: /sys
     - device: /dev
       mountPoint: /dev
-      options: {{{options}}}
+      options: bind
     - device: tmpfs
       fs: tmpfs
       mountPoint: /run
-    - device: /run/udev
-      mountPoint: /run/udev
-      options: {{{options}}}
 
 extraMountsEfi:
     - device: efivarfs
       fs: efivarfs
-      mountPoint: /sys/firmware/efi/efivars
+      mountPoint: /sys/firmware/efi/efivars

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

@@ -27,13 +27,13 @@ extraMounts:
       mountPoint: /sys
     - device: /dev
       mountPoint: /dev
-      options: {{{options}}}      
+      options: [ bind ]
     - device: tmpfs
       fs: tmpfs
       mountPoint: /run
     - device: /run/udev
       mountPoint: /run/udev
-      options: {{{options}}}
+      options: [ bind ]
     - device: efivarfs
       fs: efivarfs
       mountPoint: /sys/firmware/efi/efivars
@@ -119,5 +119,3 @@ mountOptions:
       options: [ defaults, compress=zstd:1 ]
     - filesystem: btrfs_swap
       options: [ defaults, noatime ]
-
-

package/conf/distros/buster/calamares/modules/shellprocess@boot_deploy.yml

@@ -0,0 +1,23 @@
+# SPDX-FileCopyrightText: 2020 Harald Sitter <sitter@kde.org>
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+#
+# This is run outside the chroot!
+# As per at least 20.04+ /boot on the squashfs no longer contains the initrd
+# or vmlinuz, instead we'll first fish the kernel out of the ISO.
+#
+# NB: initrd is handled by the initramfs module.
+---
+dontChroot: true
+timeout: 300
+script:
+    # Si tratta di una soluzione un po' improvvisata, ma sufficiente per la versione 20.04+, poiché non è più necessario
+    # considerare la differenza tra firmato e non firmato, quindi quanto riportato di seguito è praticamente
+    # sufficiente. La gestione degli errori è però un po' carente.
+    # Riconfigureremo il kernel nel modulo boot_reconfigure per garantire che gli hook
+    # vengano eseguiti secondo necessità.
+
+    # ubuntu
+    # cp --preserve=timestamps /lib/live/mount/medium/live/vmlinuz-`uname -r` ${ROOT}/boot/vmlinuz-`uname -r`
+
+    # debian
+    - cp --preserve=timestamps /run/live/medium/live/vmlinuz-`uname -r` ${ROOT}/boot/vmlinuz-`uname -r`

package/conf/distros/buster/calamares/modules/shellprocess@boot_reconfigure.yml

@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: 2020 Harald Sitter <sitter@kde.org>
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+#
+# Follow up to boot_deploy. This is inside chroot!
+# Make sure everything is configured properly by reconfiguring the package.
+---
+dontChroot: false
+timeout: 300
+script:
+    - chmod 644 /boot/vmlinuz-`uname -r`
+    - chown 0:0 /boot/vmlinuz-`uname -r`
+    # Reconfigure to ensure hooks are run as necessary. But disable initrd
+    # updating, it happens in initramfs module controlled by cala.
+    - INITRD=No dpkg-reconfigure -fnoninteractive linux-image-`uname -r`

package/conf/distros/buster/calamares/modules/shellprocess@mkinitramfs.yml

@@ -0,0 +1,4 @@
+# shellprocess_mkinitramfs.conf
+dontChroot: false
+script:
+    - "mkinitramfs -o /boot/initrd.img-$(uname -r)"

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

@@ -1,4 +1,4 @@
-# Debian/bookworm
+# Debian/bullseye e successivi
 ---
 # "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules
 modules-search: [ local ]
@@ -37,7 +37,22 @@ disable-cancel-during-exec: false
 #
 quit-at-end: false
 
+instances:
+- id:       mkinitramfs
+  module:   shellprocess
+  config:   shellprocess@mkinitramfs.conf
 
+- id: boot_deploy
+  module: shellprocess
+  config: shellprocess@boot_deploy.conf
+
+- id: boot_reconfigure
+  module: shellprocess
+  config: shellprocess@boot_reconfigure.conf
+
+#
+# SEQUENCE
+#
 sequence:
   # Phase 1 - prepare.
   # View modules are shown as UI pages, jobs from job modules
@@ -48,7 +63,7 @@ sequence:
       - locale
       - keyboard
       - partition
-      {{createUsers}}users
+      - users
       - summary
 
   # Phase 2 - install.
@@ -63,24 +78,26 @@ sequence:
       - unpackfs
       - dpkg-unsafe-io
       - sources-yolk
-      {{hasSystemd}}machineid
+      - machineid
       - fstab
       - locale
       - keyboard
       - localecfg
-      {{createUsers}}users
-      {{hasDisplaymanager}}displaymanager 
+      - users
+      - displaymanager
       - networkcfg
       - hwclock
-      {{hasSystemd}}services-systemd 
+      - services-systemd
+      - luksbootkeyfile
+      - shellprocess@boot_deploy      
+      - initramfscfg
       - bootloader-config
       - grubcfg
       - bootloader
-      - packages
-      - luksbootkeyfile
+      - shellprocess@mkinitramfs
+      - shellprocess@boot_reconfigure
       - plymouthcfg
-      - initramfscfg
-      - initramfs
+      - packages
       - dpkg-unsafe-io-undo
       - removeuser
       - sources-yolk-undo
@@ -102,7 +119,7 @@ sequence:
 # Only the name of the branding component (directory) should be
 # specified here, Calamares then takes care of finding it and
 # loading the contents.
-branding: {{branding}}
+branding: default
 
 # If this is set to true, Calamares will show an "Are you sure?" prompt right
 # before each execution phase, i.e. at points of no return. If this is set to

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

@@ -47,7 +47,7 @@ sequence:
       - locale
       - keyboard
       - partition
-      {{createUsers}}users
+      - users
       - summary
 
   # Phase 2 - install.
@@ -60,18 +60,18 @@ sequence:
       - partition
       - mount
       - unpackfs
-      {{hasSystemd}}machineid
+      - machineid
       - fstab
       - locale
       - keyboard
       - localecfg
       - luksbootkeyfile
       - dracutlukscfg
-      {{createUsers}}users
-      {{hasDisplaymanager}}displaymanager 
+      - users
+      - displaymanager 
       - networkcfg
       - hwclock
-      {{hasSystemd}}services-systemd 
+      - services-systemd 
       - dracut
       - bootloaderspecification
       - grubcfg
@@ -95,7 +95,7 @@ sequence:
 # Only the name of the branding component (directory) should be
 # specified here, Calamares then takes care of finding it and
 # loading the contents.
-branding: {{branding}}
+branding: default
 
 # If this is set to true, Calamares will show an "Are you sure?" prompt right
 # before each execution phase, i.e. at points of no return. If this is set to

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

@@ -52,7 +52,7 @@ sequence:
       - locale
       - keyboard
       - partition
-      {{createUsers}}users
+      - users
       - summary
 
   # Phase 2 - install.
@@ -67,16 +67,16 @@ sequence:
       - unpackfs
       # dpkg-unsafe-io
       - sources-yolk
-      {{hasSystemd}}machineid
+      - machineid
       - fstab
       - locale
       - keyboard
       - localecfg
-      {{createUsers}}users
-      {{hasDisplaymanager}}displaymanager 
+      - users
+      - displaymanager 
       - networkcfg
       - hwclock
-      {{hasSystemd}}services-systemd 
+      - services-systemd 
       - bootloader-config
       - grubcfg
       - bootloader
@@ -106,7 +106,7 @@ sequence:
 # Only the name of the branding component (directory) should be
 # specified here, Calamares then takes care of finding it and
 # loading the contents.
-branding: {{branding}}
+branding: default
 
 # If this is set to true, Calamares will show an "Are you sure?" prompt right
 # before each execution phase, i.e. at points of no return. If this is set to

package/conf/distros/noble/README.md

@@ -1,3 +1,10 @@
 # Ubuntu 24.04 noble
 
-It take all configuration from Ubuntu focal
+Completely renewed, but the problem of crypted persist!
+
+## Modules
+* partition
+* fstab
+* initcpiocfg/initramfs-tools
+* bootloader
+

package/conf/distros/noble/calamares/libexec/README.md

@@ -0,0 +1,5 @@
+# penguins-eggs
+
+Contains scripts for calamares, which are copied to `/usr/libexec/calamares`.
+
+The creation of `/usr/libexec/calamares` and its population should be done by `eggs calamares --install`, while `eggs calamares --remove` should ensure its removal.

package/conf/distros/noble/calamares/libexec/calamares-aptsources.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2020 Harald Sitter <sitter@kde.org>
+
+# Carry nomodeset into chroot
+
+set -ex
+
+echo "Reinstalling ubuntu-keyring"
+
+ls /etc/apt/sources.list.d/
+
+apt-get install --reinstall ubuntu-keyring
+
+ls /etc/apt/sources.list.d/

package/conf/distros/noble/calamares/libexec/calamares-l10n-helper.sh

@@ -0,0 +1,35 @@
+#!/bin/sh
+# SPDX-FileCopyrightText: 2018-2019 Harald Sitter <sitter@kde.org>
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+# calamares currently has subpar l10n capabilites.
+# this helper is ment to aid in getting very primitive language support
+# of the ground by using a helper from ubuntu's language-selector-common
+# to retrieve a list of packages required for the chosen system language
+# and then manually installig it.
+# https://github.com/calamares/calamares/issues/924
+
+set -ex
+
+. /etc/default/locale
+
+echo $LANG
+echo $LC_TIME
+without_ext=$(echo $LANG | cut -d. -f1)
+
+# Calamares technically should mangle locale.gen, but it's broken
+# https://github.com/calamares/calamares/issues/940
+# To unbreak this call locale-gen manually with LC_TIME. This may be the same
+# as LANG, which gets set up by lang-pack-en-base
+# (installed by check-language-support).
+# But since the pack may be any language and network might not be available
+# we set up both the LANG and LC_TIME so that both are definitely set up
+# regardless of network availablity or calamares bugs.
+# NB: this is a special way of calling it unique to Ubuntu which will mangle
+#   the config and enable it in one go
+/usr/sbin/locale-gen --keep-existing "$LANG"
+/usr/sbin/locale-gen --keep-existing "$LC_TIME"
+
+apt-get update || true
+missing=$(check-language-support --language="$without_ext")
+apt-get install -y $missing || true

package/conf/distros/noble/calamares/libexec/calamares-logs-helper.sh

@@ -0,0 +1,34 @@
+#!/bin/sh
+# SPDX-FileCopyrightText: 2018-2019 Harald Sitter <sitter@kde.org>
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+set -ex
+
+# may fail
+root=$1
+install_dir=$root/var/log/installer
+log_path=".cache/calamares/session.log"
+[ -d $install_dir ] || mkdir -p $install_dir
+
+if [ -e $HOME/$log_path ]; then
+       cp  $HOME/$log_path $install_dir/debug
+elif [ -e /root/$log_path ] ; then
+       cp  /root/$log_path $install_dir/debug
+else
+       echo "WARNING: Cannot find calamares/session.log"
+fi
+
+cp /lib/live/mount/medium/.disk/info $install_dir/media-info
+#cp /var/log/casper.log $install_dir/casper.log
+cp /var/log/syslog $install_dir/syslog
+
+gzip --stdout $root/var/lib/dpkg/status > $install_dir/initial-status.gz
+
+# OEM id isn't a thing, when in OEM mode ubiquity would also archive that.
+# https://github.com/calamares/calamares/issues/943
+
+chmod -v 600 $install_dir/*
+# Make these world readable, they can absolutely not contain anything relevant
+# to security.
+chmod -v 644 $install_dir/initial-status.gz
+chmod -v 644 $install_dir/media-info

package/conf/distros/noble/calamares/libexec/calamares-nomodeset.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2020 Harald Sitter <sitter@kde.org>
+
+# Carry nomodeset into chroot
+
+set -ex
+
+if ! grep -q nomodeset /proc/cmdline; then
+  exit 0
+fi
+
+echo "Forwarding nomodeset to installed system"
+
+cat > /etc/default/grub.d/ubuntu-installation-nomodeset.cfg << 'EOF'
+GRUB_CMDLINE_LINUX_DEFAULT="${GRUB_CMDLINE_LINUX_DEFAULT} nomodeset"
+EOF
+
+update-grub

package/conf/distros/noble/calamares/modules/after_bootloader_context.yml

@@ -0,0 +1,26 @@
+# SPDX-FileCopyrightText: 2018-2019 Harald Sitter <sitter@kde.org>
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+#
+# Workaround from ubiquity. Ubuntu's grub will want to look in EFI/ubuntu, so
+# let's make sure it can find something there.
+# This only copies the cfg and doesn't overwrite, this is specifically so
+# this doesn't interfere with an ubuntu installed on the system already.
+#
+# We'll also drop our preinstalled repository at this point if we had one.
+# That way it doesn't litter the final system. The repo is created by
+# livecd-rootfs-neon and contains bootloader packages so we can be installed
+# without internet access. (this is run for both efi and bios types)
+---
+dontChroot: false
+timeout: 120
+firmwareType:
+    efi:
+    # grub hack
+    - -mkdir /boot/efi/EFI/ubuntu
+    - -cp /boot/efi/EFI/neon/grub.cfg /boot/efi/EFI/ubuntu/
+    - command: -apt-get update
+      timeout: 60
+
+    bios:
+    - command: -apt-get update
+      timeout: 60