New upstream release

CHANGELOG

@@ -1,6 +1,24 @@
-[ 13.0.3 ]
+[ 13.0.6 ]
 
-(unreleaSed)
+ * 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
+   (thanks Roland Clobus, #1037299)
+
+[ 13.0.4 ]
+
+ * Update config in mount module so that /dev is properly mounted
+   in target
+
+[ 13.0.3 ]
 
  * Update branding elements for Calamares 3.3 series
  * Fix desktop file launcher

add-calamares-desktop-icon

@@ -31,5 +31,5 @@ fi
         metadata::trusted true
     gio set --type=string ~/Desktop/calamares-install-debian.desktop \
         metadata::xfce-exe-checksum \
-        "$(sha256sum ~/Desktop/calamares-install-debian.desktop | cut -f1)"
+        "$(sha256sum ~/Desktop/calamares-install-debian.desktop | cut -f1 -d' ')"
     touch ~/Desktop/calamares-install-debian.desktop

calamares/modules/fstab.conf

@@ -1,7 +1,7 @@
 ---
 mountOptions:
     default: defaults,noatime
-    btrfs: defaults,noatime,space_cache,autodefrag
+    btrfs: defaults,noatime
 ssdExtraMountOptions:
     ext4: discard
     jfs: discard

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
@@ -22,15 +27,18 @@ extraMounts:
       mountPoint: /sys
     - device: /dev
       mountPoint: /dev
-      options: bind
+      options: [ bind ]
     - device: tmpfs
       fs: tmpfs
       mountPoint: /run
     - device: /run/udev
       mountPoint: /run/udev
-      options: bind
-
-extraMountsEfi:
+      options: [ bind ]
     - 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

debian/.gitignore

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

debian/changelog

@@ -1,3 +1,30 @@
+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
+    - Fix delimiter in desktop icon script (Closes: #1037299)
+
+ -- Jonathan Carter <jcc@debian.org>  Sun, 11 Feb 2024 14:48:39 +0200
+
+calamares-settings-debian (13.0.4-1) unstable; urgency=medium
+
+  * New upstream release
+    - Fix crash where /dev isn't mounted
+
+ -- Jonathan Carter <jcc@debian.org>  Mon, 28 Aug 2023 19:17:29 +0200
+
 calamares-settings-debian (13.0.3-1) unstable; urgency=medium
 
   * New upstream release

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

scripts/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