New upstream release

CHANGELOG

@@ -1,3 +1,48 @@
+[ 13.0.12 ]
+
+ * Initial Ceratopsian artwork changes
+ * Support for alternate media paths (Debian bug: #1089618)
+
+[ 13.0.11 ]
+
+ * Fix typo in filename
+ * Move scripts to helpers
+
+[ 13.0.10 ]
+
+ * Make script names less generic and namespace under /usr/share/calamares
+   https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1021156
+
+[ 13.0.9 ]
+
+ * Bump minimum storage required to 15G
+   https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=#1037123
+ * Update copyright years 
+ * Fix dconf entry for calamares launcher (fixes launcher on GNOME)
+ * Use trim by default for encrypted media
+   https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1001192
+ * Use idle cycles to preload calamares binary and libraries
+   for faster startup
+
+[ 13.0.8 ]
+
+ * Move lukskeyconfig further up the task chain
+
+[ 13.0.7 ]
+
+ * Move lukskeyconfig action before fstab
+   (fstab now depends on it being configured)
+
+[ 13.0.6 ]
+
+ * Merge MR!3
+   - Add missing mountpoints
+ * Merge MR!2
+   - Install more generic grub-efi package to allow installation on
+     non-amd64 architectures
+ * Remove space_cache from fstab module (space_cache=v2 is now default)
+   and also autodefrag which isn't useful on modern storage
+
 [ 13.0.5 ]
 
  * Add pesky missing delimiter for Calamares desktop icon setup

COPYING

@@ -1,6 +1,6 @@
 ISC License
 
-Copyright (c) 2016-2023, Jonathan Carter <jcc@debian.org>
+Copyright (c) 2016-2024, Jonathan Carter <jcc@debian.org>
 
 Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
 

add-calamares-desktop-icon

@@ -26,10 +26,19 @@ else
     chmod +x $DESKTOP/calamares-install-debian.desktop
 fi
 
-# Set desktop launcher as trusted under gnome/xfce (See: #1037299)
+# Set desktop launcher as trusted under Xfce (See: #1037299)
+if [ "$XDG_CURRENT_DESKTOP" = "XFCE" ]; then
     gio set --type=string ~/Desktop/calamares-install-debian.desktop \
         metadata::trusted true
     gio set --type=string ~/Desktop/calamares-install-debian.desktop \
         metadata::xfce-exe-checksum \
         "$(sha256sum ~/Desktop/calamares-install-debian.desktop | cut -f1 -d' ')"
     touch ~/Desktop/calamares-install-debian.desktop
+fi
+
+# Preload calamares binaries and libraries using idle disk cycles
+# so that it launches faster
+ionice -C Idle cat /usr/bin/calamares > /dev/null
+for file in $(ldd /usr/bin/calamares | awk '{print $3}'): do
+    ionice -C Idle cat $file > /dev/null
+done

calamares-modules/bootloader-config/module.desc

@@ -2,5 +2,5 @@
 type:       "job"
 name:       "bootloader-config"
 interface:  "process"
-command:    "/usr/sbin/bootloader-config"
+command:    "/usr/share/calamares/helpers/calamares-bootloader-config"
 timeout:    600

calamares-modules/dpkg-unsafe-io-undo/module.desc

@@ -2,5 +2,5 @@
 type:       "job"
 name:       "dpkg-unsafe-io-undo"
 interface:  "process"
-command:    "/usr/sbin/dpkg-unsafe-io -u"
+command:    "/usr/share/calamares/helpers/calamares-dpkg-unsafe-io -u"
 timeout:    600

calamares-modules/dpkg-unsafe-io/module.desc

@@ -2,5 +2,5 @@
 type:       "job"
 name:       "dpkg-unsafe-io"
 interface:  "process"
-command:    "/usr/sbin/dpkg-unsafe-io"
+command:    "/usr/share/calamares/helpers/calamares-dpkg-unsafe-io"
 timeout:    600

calamares-modules/sources-final/module.desc

@@ -2,5 +2,5 @@
 type:       "job"
 name:       "sources-final"
 interface:  "process"
-command:    "/usr/sbin/sources-final"
+command:    "/usr/share/calamares/helpers/calamares-sources-final"
 timeout:    600

calamares-modules/sources-media-unmount/module.desc

@@ -2,5 +2,5 @@
 type:       "job"
 name:       "sources-media-unmount"
 interface:  "process"
-command:    "/usr/sbin/sources-media -u"
+command:    "/usr/share/calamares/helpers/calamares-sources-media -u"
 timeout:    600

calamares-modules/sources-media/module.desc

@@ -2,5 +2,5 @@
 type:       "job"
 name:       "sources-media"
 interface:  "process"
-command:    "/usr/sbin/sources-media"
+command:    "/usr/share/calamares/helpers/calamares-sources-media"
 timeout:    600

calamares/branding/debian/branding.desc

@@ -24,18 +24,16 @@ sidebar: widget
 navigation: widget
 
 images:
-#    productBanner:       "/usr/share/desktop-base/emerald-theme/grub/grub-16x9.png"
     productLogo:         "debian-logo.png"
     productIcon:         "debian-logo.png"
     productWelcome:      "welcome.png"
-#    productWallpaper:    ""
 
 slideshow:               "show.qml"
 
 style:
-   SidebarBackground:    "#010027"
+   SidebarBackground:    "#26475b"
    SidebarText:          "#FFFFFF"
    SidebarTextCurrent:   "#fbfbfb"
-   SidebarBackgroundCurrent: "#017877"
+   SidebarBackgroundCurrent: "#265370"
 
 slideshowAPI: 2

calamares/modules/fstab.conf

@@ -1,11 +1,11 @@
 ---
 mountOptions:
     default: defaults,noatime
-    btrfs: defaults,noatime,space_cache,autodefrag
+    btrfs: defaults,noatime
 ssdExtraMountOptions:
     ext4: discard
     jfs: discard
     xfs: discard
     swap: discard
     btrfs: discard,compress=lzo
-crypttabOptions: luks,keyscript=/bin/cat
+crypttabOptions: luks,discard,keyscript=/bin/cat

calamares/modules/mount.conf

@@ -1,17 +1,22 @@
+# 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
@@ -29,8 +34,11 @@ extraMounts:
     - device: /run/udev
       mountPoint: /run/udev
       options: [ bind ]
-
-extraMountsEfi:
     - device: efivarfs
       fs: efivarfs
       mountPoint: /sys/firmware/efi/efivars
+      efi: true
+    - device: /dev/pts
+      mountPoint: /dev/pts
+      options: [ bind ]
+      # /dev/pts is required by apt for storing the logs

calamares/modules/welcome.conf

@@ -4,7 +4,7 @@ showKnownIssuesUrl:     true
 showReleaseNotesUrl:    true
 
 requirements:
-    requiredStorage:    10
+    requiredStorage:    15
     requiredRam:        1.0
     check:
         - storage

calamares/settings.conf

@@ -62,6 +62,7 @@ sequence:
   - partition
   - mount
   - unpackfs
+  - luksbootkeyfile
   - dpkg-unsafe-io
   - sources-media
   - machineid
@@ -78,7 +79,6 @@ sequence:
   - grubcfg
   - bootloader
   - packages
-  - luksbootkeyfile
   - plymouthcfg
   - initramfscfg
   - initramfs

conf/96_calamares-settings-debian.gschema.override

@@ -1,6 +1,6 @@
 # Launcher icons
 [org.gnome.shell]
-favorite-apps=['install-debian.desktop', 'firefox-esr.desktop', 'org.gnome.Evolution.desktop', 'rhythmbox.desktop', 'libreoffice-writer.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop', 'yelp.desktop']
+favorite-apps=['calamares-install-debian.desktop', 'firefox-esr.desktop', 'org.gnome.Evolution.desktop', 'rhythmbox.desktop', 'libreoffice-writer.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop', 'yelp.desktop']
 
 # We don't want the screensaver to enable on the live media while installing
 [org.gnome.desktop.lockdown]

debian/.gitignore

@@ -1,5 +0,0 @@
-.debhelper/
-calamares-settings-debian.substvars
-calamares-settings-debian/
-debhelper-build-stamp
-files

debian/changelog

@@ -1,3 +1,52 @@
+calamares-settings-debian (13.0.12-1) unstable; urgency=medium
+
+  * New upstream release
+    - Includes initial Caretopsia artwork for Trixie
+    - Support more than one value for the media path
+      (Closes: #1089618)
+
+ -- Jonathan Carter <jcc@debian.org>  Fri, 20 Dec 2024 15:01:36 +0200
+
+calamares-settings-debian (13.0.11-1) unstable; urgency=medium
+
+  * New upstream release
+    - Make script names less generic and namespace (Closes: #1021156)
+
+ -- Jonathan Carter <jcc@debian.org>  Fri, 23 Aug 2024 17:48:32 +0200
+
+calamares-settings-debian (13.0.9-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #1037123, #1001192)
+
+ -- Jonathan Carter <jcc@debian.org>  Thu, 22 Aug 2024 18:54:20 +0200
+
+calamares-settings-debian (13.0.8-1) unstable; urgency=medium
+
+  * New upstream release
+    - Further attempt to fix encrypted installs
+
+ -- Jonathan Carter <jcc@debian.org>  Mon, 22 Jul 2024 15:39:42 +0900
+
+calamares-settings-debian (13.0.7-1) unstable; urgency=medium
+
+  * New upstream release
+    - Fix encrypted installs
+
+ -- Jonathan Carter <jcc@debian.org>  Mon, 22 Jul 2024 14:13:23 +0900
+
+calamares-settings-debian (13.0.6-1) unstable; urgency=medium
+
+  * New upstream release
+    - Mount efivarfs when needed (Closes: #1051607)
+
+ -- Jonathan Carter <jcc@debian.org>  Fri, 21 Jun 2024 18:13:26 +0200
+
+calamares-settings-debian (13.0.5-2) unstable; urgency=medium
+
+  * Update debian/watch to work with new GitLab release
+
+ -- Jonathan Carter <jcc@debian.org>  Wed, 19 Jun 2024 11:01:19 +0200
+
 calamares-settings-debian (13.0.5-1) unstable; urgency=medium
 
   * New upstream release

debian/copyright

@@ -3,7 +3,7 @@ Upstream-Name: calamares-settings-debian
 Source: https://gitlab.com/highvoltage/calamares-settings-debian
 
 Files: *
-Copyright: 2016-2023, Jonathan Carter <jcc@debian.org>
+Copyright: 2016-2024, Jonathan Carter <jcc@debian.org>
 License: ISC
 
 Files: calamares/branding/debian/*png

debian/files

@@ -0,0 +1 @@
+calamares-settings-debian_13.0.12-1_source.buildinfo utils optional

debian/install

@@ -1,6 +1,6 @@
 calamares etc
 calamares-modules/* usr/lib/calamares/modules
-scripts/* usr/sbin
+helpers/* usr/share/calamares/helpers
 *.desktop usr/share/applications
 calamares-install-debian usr/bin
 artwork/install-debian.png usr/share/pixmaps

debian/watch

@@ -1,2 +1,3 @@
 version=4
-https://salsa.debian.org/live-team/calamares-settings-debian/tags .*/calamares-settings-debian-(.*)\.tar\.gz
+opts="searchmode=plain" \
+ https://salsa.debian.org/live-team/calamares-settings-debian/tags?sort=updated_desc -/archive/v?\d[\d.]+/calamares-settings-debian-@ANY_VERSION@@ARCHIVE_EXT@ debian uupdate

helpers/calamares-bootloader-config

@@ -16,7 +16,7 @@ echo "Running bootloader-config..."
 
 if [ -d /sys/firmware/efi/efivars ]; then
     echo " * Installing grub-efi (uefi)..."
-    DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-amd64
+    DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi
 else
     echo " * install grub... (bios)"
     DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc

helpers/calamares-sources-media

@@ -1,9 +1,17 @@
 #!/bin/sh
 
 CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
-MEDIUM_PATH="/run/live/medium"
+KNOWN_MEDIUM_PATHS="/run/live/medium /run/initramfs/live"
 RELEASE="trixie"
 
+# Support both dracut and initramfs configurations to avoid substitutions
+# in live-build, see: #1089618
+for path in $KNOWN_MEDIUM_PATHS; do
+    if [ "$(mount | grep $path | cut -f3 -d" ")" = "$path" ]; then
+        MEDIUM_PATH=$path
+    fi
+done
+
 if [ "$1" = "-u" ]; then
     umount $CHROOT/$MEDIUM_PATH
     rm $CHROOT/etc/apt/sources.list.d/debian-live-media.list