New release

Fix bug
Add rsync dependency
2025-08-13 21:37:35 +02:00 · 2025-07-13 23:53:18 +02:00 · 2025-01-06 12:17:46 +02:00 · 2024-12-20 15:06:49 +02:00 · 2024-08-23 18:01:31 +02:00 · 2024-08-23 18:00:27 +02:00
43 changed files with 997 additions and 232 deletions
@@ -1,3 +1,137 @@
+[ 14.0.1 ]
+
+ * Reintroduce egg theme
+ * Update branding module to list Debian 14
+ * Set only password requirement to be at least 6 characters
+   (See Debian bugs: #1082020, #1109136)
+ * Disable lvm support (See Debian bugs: #1109138, #1060232)
+ 
+[ 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
+   (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
+ * Set installEFIFallback: true
+ * Don't allow empty passwords
+
+[ 13.0.2 ]
+
+ * Fix desktop icon path in add-calamares-desktop-icon 
+
+[ 13.0.1 ]
+
+ * Initial release for trixie
+   - Update sources.list writer and media sources
+ * Update copyright years
+ * Update installer artwork (egg theme)
+ * Rename launchers (partial fix towards #1021156)
+ * Mark desktop launchers as trusted for xfce/gnome (#1037299)
+
+[ 12.0.9 ]
+
+ * Fix typos in version numbers for last two changelog entries
+ * Install cryptsetup-initramfs, cryptsetup and keyutils (only) when needed
+   (required due to these packages only now existing on package pool,
+    not on the squashfs filesystem)
+
+[ 12.0.8 ]
+
+ * Do grub work within the chroot
+
+[ 12.0.7 ]
+
+ * Enable os-prober /after/ grub has been installed.
+
+[ 12.0.6 ]
+
+ * Enable os-prober
+
+[ 12.0.5 ]
+
+ * Update sources.list to include non-free-firmware and backports
+
+[ 12.0.4 ]
+
+ * Update artwork for Debian 12 (emerald theme)
+ * Make installer slide translatable
+
+[ 12.0.3 ]
+
+ * Work around hidpi issue (#992162)
+
+[ 12.0.2 ]
+
+ * Fix dpkg-unsafe-io and dpkg-unsafe-io-undo names
+ * Update the sources-media script to use bookworm
+
+[ 12.0.1 ]
+
+ * Initial branding description and sources.list changes for bookworm
+ * Add dpkg-unsafe-io module to speed up post-installation
+   (Debian bug: #984794)
+
+[ 11.0.3 ]
+
+ * Update settings.conf with changes from recent releases
+ * Update sources.list to include updates security path
+   (Debian bug: #969930)
+ * Store host entropy in urandom and systemd location
+   (Debian bug: #941301)
+
 [ 11.0.2 ]

 * Use xdg-user-dir to specify Desktop path
@@ -1,6 +1,6 @@
 ISC License

-Copyright (c) 2016-2020, 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.

@@ -13,15 +13,32 @@ mkdir -p $DESKTOP
 # Among the Debian desktop environments, LXDE is the only one
 # that behaves completely different.
 if [ -f /usr/bin/lxsession ]; then
-    echo "[Desktop Entry]" > $DESKTOP/install-debian.desktop
-    echo "Type=Link" >> $DESKTOP/install-debian.desktop
-    echo "Name=Install Debian" >> $DESKTOP/install-debian.desktop
-    echo "Icon=install-debian" >> $DESKTOP/install-debian.desktop
-    echo "URL=/usr/share/applications/install-debian.desktop" \
-          >> $DESKTOP/install-debian.desktop
+    echo "[Desktop Entry]" > $DESKTOP/calamares-install-debian.desktop
+    echo "Type=Link" >> $DESKTOP/calamares-install-debian.desktop
+    echo "Name=Install Debian" >> $DESKTOP/calamares-install-debian.desktop
+    echo "Icon=install-debian" >> $DESKTOP/calamares-install-debian.desktop
+    echo "URL=/usr/share/applications/calamares-install-debian.desktop" \
+          >> $DESKTOP/calamares-install-debian.desktop
 else
-    cp /usr/share/applications/install-debian.desktop $DESKTOP
+    cp /usr/share/applications/calamares-install-debian.desktop $DESKTOP
    # Xfce needs this executable otherwise it complains, everything
    # else doesn't seem to care either way.
-    chmod +x $DESKTOP/install-debian.desktop
+    chmod +x $DESKTOP/calamares-install-debian.desktop
 fi
+
+# 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
@@ -0,0 +1,26 @@
+#!/bin/sh
+###
+# Wrapper for running calamares on Debian live media
+###
+
+# Stale file left behind by live-build that messes with partitioning
+sudo mv /etc/fstab /etc/fstab.orig.calamares
+
+# Allow Calamares to scale the window for hidpi displays
+# This is fixed in the Calamares 3.3.0 series, so we can remove this
+# once we switch to that
+# Upstream commit that will make this obsolete:
+#     https://github.com/calamares/calamares/commit/e9f011b686a0982fb7828e8ac02a8e0784d3b11f
+# Upstream bug:
+#     https://github.com/calamares/calamares/issues/1945
+# Debian bug:
+#     https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=992162
+export QT_AUTO_SCREEN_SCALE_FACTOR=1
+
+# Access control to run calamares as root for xwayland
+xhost +si:localuser:root
+pkexec calamares
+xhost -si:localuser:root
+
+# Restore stale fstab, for what it's worth
+sudo mv /etc/fstab.orig.calamares /etc/fstab
@@ -3,7 +3,7 @@ Type=Application
 Version=1.0
 Name=Install Debian
 GenericName=Calamares Installer
-Exec=install-debian
+Exec=calamares-install-debian
 Comment=Calamares — Installer for Debian Live
 Keywords=calamares;system;install;debian;installer
 Icon=install-debian
@@ -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
@@ -0,0 +1,6 @@
+---
+type:       "job"
+name:       "dpkg-unsafe-io-undo"
+interface:  "process"
+command:    "/usr/share/calamares/helpers/calamares-dpkg-unsafe-io -u"
+timeout:    600
@@ -0,0 +1,6 @@
+---
+type:       "job"
+name:       "dpkg-unsafe-io"
+interface:  "process"
+command:    "/usr/share/calamares/helpers/calamares-dpkg-unsafe-io"
+timeout:    600
@@ -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
@@ -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
@@ -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
@@ -1,18 +1,27 @@
 ---
 componentName:   debian
 welcomeStyleCalamares: true
+welcomeExpandingLogo: true
+windowExpanding: normal
+windowSize: 800px,580px
+windowPlacement: center

 strings:
    productName:         Debian GNU/Linux
-    shortProductName:    Debian testing
-    version:             11 (bullseye)
-    shortVersion:        11
-    versionedName:       Debian 11 (bullseye)
-    shortVersionedName:  Debian 11
+    shortProductName:    Debian
+    version:             14
+    shortVersion:        14
+    versionedName:       Debian 14
+    shortVersionedName:  Debian 14
    bootloaderEntryName: Debian
    productUrl:          https://debian.org
    supportUrl:          https://www.debian.org/support
-    releaseNotesUrl:     https://www.debian.org/releases/bullseye/releasenotes
+    knownIssuesUrl:      https://bugs.debian.org
+    releaseNotesUrl:     https://www.debian.org/releases/forky/releasenotes
+    donateUrl:           https://www.debian.org
+
+sidebar: widget
+navigation: widget

 images:
    productLogo:         "debian-logo.png"
@@ -22,6 +31,9 @@ images:
 slideshow:               "show.qml"

 style:
-   sidebarBackground:    "#2c3133"
-   sidebarText:          "#FFFFFF"
-   sidebarTextSelect:    "#4d7079"
+   SidebarBackground:    "#26475b"
+   SidebarText:          "#FFFFFF"
+   SidebarTextCurrent:   "#fbfbfb"
+   SidebarBackgroundCurrent: "#265370"
+
+slideshowAPI: 2
@@ -40,8 +40,8 @@ Presentation
        Text {
            anchors.horizontalCenter: background1.horizontalCenter
            anchors.top: background1.bottom
-            text: "Welcome to Debian GNU/Linux.<br/>"+
-                  "The rest of the installation is automated and should complete in a few minutes."
+            text: qsTr("Welcome to Debian GNU/Linux.<br/>"+
+                  "The rest of the installation is automated and should complete in a few minutes.")
            wrapMode: Text.WordWrap
            width: 600
            horizontalAlignment: Text.Center
@@ -51,4 +51,4 @@ efiBootMgr: "efibootmgr"
 # 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.
-installEFIFallback: false
+installEFIFallback: true 
@@ -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
@@ -6,3 +6,10 @@ dbus: true
 # Whether /var/lib/dbus/machine-id should be a symlink to /etc/machine-id
 # (ignored if dbus is false, or if there is no /etc/machine-id to point to).
 symlink: true
+# Whether to copy entropy from the host
+entropy-copy: true
+# Which files to write (paths in the target)
+entropy-files:
+    - /var/lib/urandom/random-seed
+    - /var/lib/systemd/random-seed
+
@@ -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
@@ -0,0 +1,385 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+
+# Options for EFI system partition.
+#
+# - *mountPoint*
+#   This setting specifies the mount point of the EFI system partition. Some
+#   distributions (Fedora, Debian, Manjaro, etc.) use /boot/efi, others (KaOS,
+#   etc.) use just /boot.
+#
+#   Defaults to "/boot/efi", may be empty (but weird effects ensue)
+# - *recommendedSize*
+#   This optional setting specifies the size of the EFI system partition.
+#   If nothing is specified, the default size of 300MiB will be used.
+#   When writing quantities here, M is treated as MiB, and if you really
+#   want one-million (10^6) bytes, use MB.
+# - *minimumSize*
+#   This optional setting specifies the absolute minimum size of the EFI
+#   system partition. If nothing is specified, the *recommendedSize*
+#   is used instead.
+# - *label*
+#   This optional setting specifies the name of the EFI system partition (see
+#   PARTLABEL; gpt only; requires KPMCore >= 4.2.0).
+#   If nothing is specified, the partition name is left unset.
+#
+# Going below the *recommended* size is allowed, but the user will
+# get a warning that it might not work. Going below the *minimum*
+# size is not allowed and the user will be told it will not work.
+#
+# Both quantities must be at least 32MiB, this is enforced by the EFI
+# spec. If minimum is not specified, it defaults to the recommended
+# size. Distro's that allow more user latitude can set the minimum lower.
+efi:
+    mountPoint:         "/boot/efi"
+    recommendedSize:    300MiB
+    minimumSize:        32MiB
+    label:              "EFI"
+
+# Deprecated alias of efi.mountPoint
+# efiSystemPartition:     "/boot/efi"
+
+# Deprecated alias of efi.recommendedSize
+# efiSystemPartitionSize:          300MiB
+
+# Deprecated alias of efi.label
+# efiSystemPartitionName:     EFI
+
+# In autogenerated partitioning, allow the user to select a swap size?
+# If there is exactly one choice, no UI is presented, and the user
+# cannot make a choice -- this setting is used. If there is more than
+# one choice, a UI is presented.
+#
+# Legacy settings *neverCreateSwap* and *ensureSuspendToDisk* correspond
+# to values of *userSwapChoices* as follows:
+#    - *neverCreateSwap* is true, means [none]
+#    - *neverCreateSwap* is false, *ensureSuspendToDisk* is false, [small]
+#    - *neverCreateSwap* is false, *ensureSuspendToDisk* is true, [suspend]
+#
+# Autogenerated swap sizes are as follows:
+#    - *suspend*: Swap is always at least total memory size,
+#      and up to 4GiB RAM follows the rule-of-thumb 2 * memory;
+#      from 4GiB to 8 GiB it stays steady at 8GiB, and over 8 GiB memory
+#      swap is the size of main memory.
+#    - *small*: Follows the rules above, but Swap is at
+#      most 8GiB, and no more than 10% of available disk.
+# In both cases, a fudge factor (usually 10% extra) is applied so that there
+# is some space for administrative overhead (e.g. 8 GiB swap will allocate
+# 8.8GiB on disk in the end).
+#
+# If *file* is enabled here, make sure to have the *fstab* module
+# as well (later in the exec phase) so that the swap file is
+# actually created.
+userSwapChoices:
+    - none      # Create no swap, use no swap
+    - small     # Up to 4GB
+    - suspend   # At least main memory size
+    # - reuse     # Re-use existing swap, but don't create any (unsupported right now)
+    - file      # To swap file instead of partition
+
+# This optional setting specifies the name of the swap partition (see
+# PARTLABEL; gpt only; requires KPMCore >= 4.2.0).
+# If nothing is specified, the partition name is left unset.
+# swapPartitionName:      swap
+
+# LEGACY SETTINGS (these will generate a warning)
+# ensureSuspendToDisk:    true
+# neverCreateSwap:        false
+
+# This setting specifies the LUKS generation (i.e LUKS1, LUKS2) used internally by
+# cryptsetup when creating an encrypted partition.
+#
+# This option is set to luks1 by default, as grub doesn't support LUKS2 + Argon2id
+# currently. On the other hand grub does support LUKS2 with PBKDF2 and could therefore be
+# also set to luks2. Also there are some patches for grub and Argon2.
+# See: https://aur.archlinux.org/packages/grub-improved-luks2-git
+#
+# Choices: luks1, luks2 (in addition, "luks" means "luks1")
+#
+# The default is luks1
+#
+luksGeneration: luks2
+
+# This setting determines if encryption should be allowed when using zfs.  This
+# setting has no effect unless zfs support is provided.
+#
+# This setting is to handle the fact that some bootloaders(such as grub) do not
+# support zfs encryption.
+#
+# The default is true
+#
+# allowZfsEncryption: true
+
+# Correctly draw nested (e.g. logical) partitions as such.
+drawNestedPartitions:   false
+
+# Show/hide partition labels on manual partitioning page.
+alwaysShowPartitionLabels: true
+
+# Allow manual partitioning.
+#
+# When set to false, this option hides the "Manual partitioning" button,
+# limiting the user's choice to "Erase", "Replace" or "Alongside".
+# This can be useful when using a custom partition layout we don't want
+# the user to modify.
+#
+# If nothing is specified, manual partitioning is enabled.
+#allowManualPartitioning:   true
+
+# Show not encrypted boot partition warning.
+#
+# When set to false, this option does not show the
+# "Boot partition not encrypted" warning when encrypting the
+# root partition but not /boot partition.
+#
+# If nothing is specified, the warning is shown.
+#showNotEncryptedBootMessage:   true
+
+# Initial selection on the Choice page
+#
+# There are four radio buttons (in principle: erase, replace, alongside, manual),
+# and you can pick which of them, if any, is initially selected. For most
+# installers, "none" is the right choice: it makes the user pick something specific,
+# rather than accidentally being able to click past an important choice (in particular,
+# "erase" is a dangerous choice).
+#
+# The default is "none"
+#
+initialPartitioningChoice: none
+#
+# Similarly, some of the installation choices may offer a choice of swap;
+# the available choices depend on *userSwapChoices*, above, and this
+# setting can be used to pick a specific one.
+#
+# The default is "none" (no swap) if that is one of the enabled options, otherwise
+# one of the items from the options.
+initialSwapChoice: none
+
+# armInstall
+#
+# Leaves 16MB empty at the start of a drive when partitioning
+# where usually the u-boot loader goes
+#
+# armInstall: false
+
+# Default partition table type, used when a "erase" disk is made.
+#
+# When erasing a disk, a new partition table is created on disk.
+# In other cases, e.g. Replace and Alongside, as well as when using
+# manual partitioning, this partition table exists already on disk
+# and it is left unmodified.
+#
+# Possible values: gpt, msdos (or other names defined by KPMcore).
+# Names are case-sensitive.
+#
+# If nothing is specified, Calamares defaults to "gpt" if system is
+# efi or "msdos" otherwise.
+#
+# defaultPartitionTableType: msdos
+
+# Requirement for partition table type
+#
+# Restrict the installation on disks that match the type of partition
+# tables that are specified.
+#
+# Possible values: msdos, gpt (or other names defined by KPMcore).
+# Names are case-sensitive.
+#
+# If nothing is specified, Calamares defaults to both "msdos" and "gpt".
+#
+# requiredPartitionTableType: gpt
+# requiredPartitionTableType:
+#     - msdos
+#     - gpt
+
+# Default filesystem type, used when a "new" partition is made.
+#
+# When replacing a partition, the new filesystem type will be from the
+# defaultFileSystemType value. In other cases, e.g. Erase and Alongside,
+# as well as when using manual partitioning and creating a new
+# partition, this filesystem type is pre-selected. Note that
+# editing a partition in manual-creation mode will not automatically
+# change the filesystem type to this default value -- it is not
+# creating a new partition.
+#
+# Suggested values: ext2, ext3, ext4, reiser, xfs, jfs, btrfs
+# If nothing is specified, Calamares defaults to "ext4".
+#
+# Names are case-sensitive and defined by KPMCore.
+defaultFileSystemType:  "ext4"
+
+# Selectable filesystem type, used when "erase" is done.
+#
+# When erasing the disk, the *defaultFileSystemType* is used (see
+# above), but it is also possible to give users a choice:
+# list suitable filesystems here. A drop-down is provided
+# to pick which is the filesystems will be used.
+#
+# The value *defaultFileSystemType* is added to this list (with a warning)
+# if not present; the default pick is the *defaultFileSystemType*.
+#
+# If not specified at all, uses *defaultFileSystemType* without a
+# warning (this matches traditional no-choice-available behavior best).
+# availableFileSystemTypes:  ["ext4","f2fs"]
+
+# Per-directory filesystem restrictions.
+#
+# This optional setting specifies what filesystems the user can and cannot use
+# for various directories and mountpoints when using manual partitioning.
+#
+# If nothing is specified, the only restriction enforced by default is that
+# the EFI system partition must use the fat32 filesystem.
+#
+# Otherwise, the filesystem restrictions are defined as follow:
+#
+# directoryFilesystemRestrictions:
+#     - directory: "any"
+#       allowedFilesystemTypes: ["all"]
+#     - directory: "/"
+#       allowedFilesystemTypes: ["ext4","xfs","btrfs","jfs","f2fs"]
+#     - mountpoint: "efi"
+#       allowedFilesystemTypes: ["fat32"]
+#       onlyWhenMountpoint: true
+#
+# There can be any number of mountpoints listed, each entry having the
+# following attributes:
+#   - mountpoint: mountpoint's full path
+#                 or
+#                 "any" to specify a global whitelist that applies to all
+#                 mountpoints
+#                 or
+#                 "efi" to specify a whitelist specific to the EFI system
+#                 partition, wherever that partition is located
+#   - allowedFilesystemTypes: the list of all filesystems valid for this
+#                             mountpoint. If the list contains exactly one
+#                             element, and that element is the special value
+#                             "any", all filesystem types recognized by
+#                             Calamares will be allowed.
+#   - onlyWhenMountpoint: Whether the restriction should apply only when the
+#                         specified directory is a mountpoint. When set to
+#                         true, Calamares will only enforce the listed
+#                         restrictions when the user makes a separate partition
+#                         for this directory and assigns the mountpoint
+#                         accordingly. When set to false, Calamares will
+#                         ensure this directory uses the specified filesystem
+#                         even if the directory is part of a filesystem on a
+#                         different mountpoint. Defaults to false.
+
+# The ClearMounts job unmounts / unmaps things before partitioning.
+# Some special entries under /dev/mapper are excepted from this process.
+# The example lists the three hard-coded exceptions which always apply
+# (they don't need to be listed here). Add other names or wildcards (with
+# a trailing '*') to this list if the live-ISO has additional mounts.
+essentialMounts: [ "live-*", "control", "ventoy" ]
+
+# Show/hide LUKS related functionality in automated partitioning modes.
+# Disable this if you choose not to deploy early unlocking support in GRUB2
+# and/or your distribution's initramfs solution.
+#
+# BIG FAT WARNING:
+#
+# This option is unsupported, as it cuts out a crucial security feature.
+# Disabling LUKS and shipping Calamares without a correctly configured GRUB2
+# and initramfs is considered suboptimal use of the Calamares software. The
+# Calamares team will not provide user support for any potential issue that
+# may arise as a consequence of setting this option to false.
+# It is strongly recommended that system integrators put in the work to support
+# LUKS unlocking support in GRUB2 and initramfs/dracut/mkinitcpio/etc.
+# For more information on setting up GRUB2 for Calamares with LUKS, see
+# https://github.com/calamares/calamares/wiki/Deploy-LUKS
+#
+# If nothing is specified, LUKS is enabled in automated modes.
+#enableLuksAutomatedPartitioning:    true
+
+# When enableLuksAutomatedPartitioning is true, this option will pre-check
+# encryption checkbox. This option is only usefull to help people to not forget
+# to cypher their disk when installing in enterprise (for exemple).
+#preCheckEncryption:    false
+
+# LVM support
+#
+# There is only one sub-key available, *enable* (defaults to true)
+# which can be used to show (default) or hide the LVM buttons in the partitioning module.
+lvm:
+    enable: false
+
+# Partition layout.
+#
+# This optional setting specifies a custom partition layout.
+#
+# If nothing is specified, the default partition layout is a single partition
+# for root that uses 100% of the space and uses the filesystem defined by
+# defaultFileSystemType.
+#
+# Note: the EFI system partition is prepended automatically to the layout if
+# needed; the swap partition is appended to the layout if enabled (selections
+# "small" or "suspend" in *userSwapChoices*).
+#
+# Otherwise, the partition layout is defined as follow:
+#
+# partitionLayout:
+#     - name: "rootfs"
+#       type: "4f68bce3-e8cd-4db1-96e7-fbcaf984b709"
+#       filesystem: "ext4"
+#       noEncrypt: false
+#       mountPoint: "/"
+#       size: 20%
+#       minSize: 500M
+#       maxSize: 10G
+#       attributes: 0xffff000000000003
+#     - name: "home"
+#       type: "933ac7e1-2eb4-4f13-b844-0e14e2aef915"
+#       filesystem: "ext4"
+#       noEncrypt: false
+#       mountPoint: "/home"
+#       size: 3G
+#       minSize: 1.5G
+#       features:
+#         64bit: false
+#         casefold: true
+#     - name: "data"
+#       filesystem: "fat32"
+#       mountPoint: "/data"
+#       features:
+#         sector-size: 4096
+#         sectors-per-cluster: 128
+#       size: 100%
+#
+# There can be any number of partitions, each entry having the following attributes:
+#   - name: filesystem label
+#           and
+#           partition name (gpt only; since KPMCore 4.2.0)
+#   - uuid: partition uuid (optional parameter; gpt only; requires KPMCore >= 4.2.0)
+#   - type: partition type (optional parameter; gpt only; requires KPMCore >= 4.2.0)
+#   - attributes: partition attributes (optional parameter; gpt only; requires KPMCore >= 4.2.0)
+#   - filesystem: filesystem type (optional parameter)
+#       - if not set at all, treat as "unformatted"
+#       - if "unformatted", no filesystem will be created
+#       - if "unknown" (or an unknown FS name, like "elephant") then the
+#         default filesystem type, or the user's choice, will be applied instead
+#         of "unknown" (e.g. the user might pick ext4, or xfs).
+#   - noEncrypt: whether this partition is exempt from encryption if enabled (optional parameter; default is false)
+#   - mountPoint: partition mount point (optional parameter; not mounted if unset)
+#   - size: partition size in bytes (append 'K', 'M' or 'G' for KiB, MiB or GiB)
+#           or
+#           % of the available drive space if a '%' is appended to the value
+#   - minSize: minimum partition size (optional parameter)
+#   - maxSize: maximum partition size (optional parameter)
+#   - features: filesystem features (optional parameter; requires KPMCore >= 4.2.0)
+#       name: boolean or integer or string
+
+# Checking for available storage
+#
+# This overlaps with the setting of the same name in the welcome module's
+# requirements section. If nothing is set by the welcome module, this
+# value is used instead. It is still a problem if there is no required
+# size set at all, and the replace and resize options will not be offered
+# if no required size is set.
+#
+# The value is in Gibibytes (GiB).
+#
+# BIG FAT WARNING: except for OEM-phase-0 use, you should be using
+#                  the welcome module, **and** configure this value in
+#                  `welcome.conf`, not here.
+# requiredStorage: 3.5
@@ -15,3 +15,9 @@ defaultGroups:
 autologinGroup:  autologin
 sudoersGroup:    sudo
 setRootPassword: false
+
+passwordRequirements:
+    nonempty: true
+    minLength: 6  # Password at least this many characters
+    maxLength: -1  # Password at most this many characters
+
@@ -4,7 +4,7 @@ showKnownIssuesUrl:     true
 showReleaseNotesUrl:    true

 requirements:
-    requiredStorage:    10
+    requiredStorage:    15
    requiredRam:        1.0
    check:
        - storage
@@ -5,8 +5,41 @@
 # "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules
 modules-search: [ local, /usr/lib/calamares/modules ]

-sequence:
+# If this is set to true, Calamares refers to itself as a "setup program"
+# rather than an "installer". Defaults to the value of dont-chroot, but
+# Calamares will complain if this is not explicitly set.
+oem-setup: false

+# If this is set to true, the "Cancel" button will be disabled entirely.
+# The button is also hidden from view.
+#
+# This can be useful if when e.g. Calamares is used as a post-install
+# configuration tool and you require the user to go through all the
+# configuration steps.
+#
+# Default is false, but Calamares will complain if this is not explicitly set.
+#
+# YAML: boolean.
+disable-cancel: false
+
+# If this is set to true, the "Cancel" button will be disabled once
+# you start the 'Installation', meaning there won't be a way to cancel
+# the Installation until it has finished or installation has failed.
+#
+# Default is false, but Calamares will complain if this is not explicitly set.
+#
+# YAML: boolean.
+disable-cancel-during-exec: false
+
+# If this is set to true, then once the end of the sequence has
+# been reached, the quit (done) button is clicked automatically
+# and Calamares will close. Default is false: the user will see
+# that the end of installation has been reached, and that things are ok.
+#
+#
+quit-at-end: false
+
+sequence:
 # Phase 1 - prepare.
 # View modules are shown as UI pages, jobs from job modules
 # are executed immediately in the background.
@@ -29,6 +62,8 @@ sequence:
  - partition
  - mount
  - unpackfs
+  - luksbootkeyfile
+  - dpkg-unsafe-io
  - sources-media
  - machineid
  - fstab
@@ -44,10 +79,10 @@ sequence:
  - grubcfg
  - bootloader
  - packages
-  - luksbootkeyfile
  - plymouthcfg
  - initramfscfg
  - initramfs
+  - dpkg-unsafe-io-undo
  - sources-media-unmount
  - sources-final
  - umount
@@ -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]
@@ -1,5 +0,0 @@
-.debhelper/
-calamares-settings-debian.substvars
-calamares-settings-debian/
-debhelper-build-stamp
-files
@@ -1,22 +1,252 @@
-calamares-settings-debian (10.0.20-1+deb10u3) buster; urgency=medium
+calamares-settings-debian (14.0.1-1) unstable; urgency=medium

-  * Use xdg-user-dir to specify Desktop directory
-    (Closes: #959541)
+  * New upstream release
+    - Reintroduce egg theme
+    - Update branding for Debian 14
+    - Set only password requirement to be at least 6 characters
+      (Closes: #1082020, #1109136)
+    - Disable lvm support (Closes: #1109138, #1060232)

- -- Jonathan Carter <jcc@debian.org>  Wed, 15 Jul 2020 18:15:49 +0200
+ -- Jonathan Carter <jcc@debian.org>  Wed, 13 Aug 2025 21:32:37 +0200

-calamares-settings-debian (10.0.20-1+deb10u2) buster; urgency=medium
+calamares-settings-debian (13.0.13-1) unstable; urgency=medium

-  * Fix type in previous entry (s/desk/disk)
-  * Enable displaymanager module, fixing autologin options
-    (Closes: #934503, #934504)
+  * New upstream relese
+    - Fix support url (Closes: #1109232)

- -- Jonathan Carter <jcc@debian.org>  Wed, 15 Jul 2020 17:15:11 +0200
+ -- Jonathan Carter <jcc@debian.org>  Sun, 13 Jul 2025 23:52:19 +0200

-calamares-settings-debian (10.0.20-1+deb10u1) buster; urgency=medium
+calamares-settings-debian (13.0.12-2) unstable; urgency=medium

-  * Fix permissions for initramfs image when full-disk encryption
-    is enabled. (CVE-2019-13179) (Closes: #931373)
+  * Add rsync as a dependency (Closes: #1080188) 
+
+ -- Jonathan Carter <jcc@debian.org>  Mon, 06 Jan 2025 12:03:48 +0200
+
+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
+    - 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
+    - Do not allow empty password (Closes: #1050291)
+
+ -- Jonathan Carter <jcc@debian.org>  Fri, 25 Aug 2023 21:51:02 +0200
+
+calamares-settings-debian (13.0.2-1) unstable; urgency=medium
+
+  * New upstream release
+    - Fix desktop script path
+
+ -- Jonathan Carter <jcc@debian.org>  Thu, 24 Aug 2023 17:32:33 +0200
+
+calamares-settings-debian (13.0.1-1) unstable; urgency=medium
+
+  * New upstream release
+    - Initial trixie support
+  * Add dependency: libglib2.0-bin
+    - Plus upstream fixes for desktop launcher (Closes: #1037299)
+  * Update standards version to 4.6.2
+  * Update copyright years
+
+ -- Jonathan Carter <jcc@debian.org>  Thu, 24 Aug 2023 16:49:49 +0200
+
+calamares-settings-debian (12.0.9-1) unstable; urgency=medium
+
+  * New upstream release
+    - Deal with changes in how luks tools are installed from live media
+
+ -- Jonathan Carter <jcc@debian.org>  Thu, 04 May 2023 20:47:17 +0200
+
+calamares-settings-debian (12.0.8-1) unstable; urgency=medium
+
+  * New upstream release
+    - Make grub changes in the correct place (within the chroot)
+
+ -- Jonathan Carter <jcc@debian.org>  Wed, 26 Apr 2023 14:25:34 +0200
+
+calamares-settings-debian (12.0.7-1) unstable; urgency=medium
+
+  * New upstream release
+    - Re-enable os-prober
+
+ -- Jonathan Carter <jcc@debian.org>  Wed, 26 Apr 2023 13:43:01 +0200
+
+calamares-settings-debian (12.0.5-2) unstable; urgency=medium
+
+  * Depend on pkexec (Closes: #1033930) 
+
+ -- Jonathan Carter <jcc@debian.org>  Tue, 04 Apr 2023 09:51:03 +0200
+
+calamares-settings-debian (12.0.5-1) unstable; urgency=medium
+
+  * New upstream release
+    - Update sources.list to include backports and non-free-firmware
+
+ -- Jonathan Carter <jcc@debian.org>  Mon, 06 Mar 2023 19:24:55 +0200
+
+calamares-settings-debian (12.0.4-1) unstable; urgency=medium
+
+  * New upstream release
+    - Bookworm artwork
+    - Make installer slide translatable
+
+ -- Jonathan Carter <jcc@debian.org>  Mon, 06 Mar 2023 12:33:33 +0200
+
+calamares-settings-debian (12.0.3-1) unstable; urgency=medium
+
+  * New upstream release
+    (work arounds hidpi issue, Closes: #992162)
+
+ -- Jonathan Carter <jcc@debian.org>  Tue, 02 Aug 2022 09:35:26 +0200
+
+calamares-settings-debian (12.0.2-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Jonathan Carter <jcc@debian.org>  Thu, 19 May 2022 14:51:29 +0200
+
+calamares-settings-debian (12.0.1-1) unstable; urgency=medium
+
+  [ Debian Janitor ]
+  * Set upstream metadata fields: Repository, Repository-Browse.
+  * Update standards version to 4.6.0, no changes needed.
+
+  [ Jonathan Carter ]
+  * New release
+    - Use force-unsafe-io to speed up dpkg actions (Closes: #984794)
+
+ -- Jonathan Carter <jcc@debian.org>  Mon, 09 May 2022 13:37:12 +0200
+
+calamares-settings-debian (11.0.5-2) unstable; urgency=medium
+
+  * Add supplimental information to previous changelog entry
+
+ -- Jonathan Carter <jcc@debian.org>  Mon, 26 Jul 2021 10:27:12 +0200
+
+calamares-settings-debian (11.0.5-1) unstable; urgency=medium
+
+  * New upstream release
+    - Corrects the apt sources for security updates (Closes: #991474)
+
+ -- Jonathan Carter <jcc@debian.org>  Sun, 25 Jul 2021 14:10:24 +0200
+
+calamares-settings-debian (11.0.4-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Jonathan Carter <jcc@debian.org>  Wed, 11 Nov 2020 14:54:50 +0200
+
+calamares-settings-debian (11.0.3-1) unstable; urgency=medium
+
+  * New upstream release
+    (Closes: #969930, #941301)
+
+ -- Jonathan Carter <jcc@debian.org>  Sun, 18 Oct 2020 19:48:10 +0200
+
+calamares-settings-debian (11.0.2-1) unstable; urgency=medium
+
+  * New upstream release
+    (Closes: #934503, #934504, #959541)
+  * Update standards version to 4.5.0
+  * Upgrade to debhelper-compat 13
+  * Declare Rules-Requires-Root: no
+  * Update copyright years
+
+ -- Jonathan Carter <jcc@debian.org>  Wed, 15 Jul 2020 18:39:57 +0200
+
+calamares-settings-debian (11.0.1-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Jonathan Carter <jcc@debian.org>  Wed, 25 Sep 2019 10:36:54 +0000
+
+calamares-settings-debian (10.0.25-2) unstable; urgency=medium
+
+  * Initial source-only upload
+  * Update standards version to 4.4.0
+
+ -- Jonathan Carter <jcc@debian.org>  Mon, 05 Aug 2019 21:30:20 +0200
+
+calamares-settings-debian (10.0.25-1) unstable; urgency=medium
+
+  * New upstream release
+    - Refine fix for initramfs permissions, only apply
+      when encryption is enabled
+
+ -- Jonathan Carter <jcc@debian.org>  Fri, 05 Jul 2019 17:37:33 +0200
+
+calamares-settings-debian (10.0.24-1) unstable; urgency=medium
+
+  * New upstream release
+    - Fix path in previous CVE bug fix
+
+ -- Jonathan Carter <jcc@debian.org>  Wed, 03 Jul 2019 13:29:07 +0000
+
+calamares-settings-debian (10.0.23-1) unstable; urgency=medium
+
+  * New upstream release
+    -  Fixes permissions for initramfs image (CVE-2019-13179)
+       (Closes: #931373)

 -- Jonathan Carter <jcc@debian.org>  Wed, 03 Jul 2019 13:05:47 +0000

@@ -3,7 +3,7 @@ Section: utils
 Priority: optional
 Maintainer: Jonathan Carter <jcc@debian.org>
 Build-Depends: debhelper-compat (= 13), libglib2.0-bin
-Standards-Version: 4.5.0
+Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Homepage: https://salsa.debian.org/live-team/calamares-settings-debian
 Vcs-Git: https://salsa.debian.org/live-team/calamares-settings-debian-packaging.git
@@ -12,8 +12,11 @@ Vcs-Browser: https://salsa.debian.org/live-team/calamares-settings-debian-packag
 Package: calamares-settings-debian
 Architecture: all
 Depends: calamares,
+         rsync,
         cryptsetup,
+         libglib2.0-bin,
         keyutils,
+         pkexec,
         qml-module-qtquick-window2,
         qml-module-qtquick2,
         ${misc:Depends}
@@ -3,7 +3,7 @@ Upstream-Name: calamares-settings-debian
 Source: https://gitlab.com/highvoltage/calamares-settings-debian

 Files: *
-Copyright: 2016-2020, Jonathan Carter <jcc@debian.org>
+Copyright: 2016-2024, Jonathan Carter <jcc@debian.org>
 License: ISC

 Files: calamares/branding/debian/*png
@@ -11,7 +11,7 @@ Copyright: 2019 Isabelle Simpkins <isy@koipond.org.uk>
 License: CC-BY-SA-3.0

 Files: debian/*
-Copyright: 2016-2020 Jonathan Carter <jcc@debian.org>
+Copyright: 2016-2023 Jonathan Carter <jcc@debian.org>
 License: ISC

 Files: calamares/branding/debian/show.qml
@@ -0,0 +1 @@
+calamares-settings-debian_14.0.1-1_source.buildinfo utils optional
@@ -1,8 +1,8 @@
 calamares etc
 calamares-modules/* usr/lib/calamares/modules
-scripts/* usr/sbin
+helpers/* usr/share/calamares/helpers
 *.desktop usr/share/applications
-install-debian usr/bin
+calamares-install-debian usr/bin
 artwork/install-debian.png usr/share/pixmaps
 conf/96_calamares-settings-debian.gschema.override usr/share/glib-2.0/schemas
 conf/calamares-desktop-icon.desktop etc/xdg/autostart
@@ -1,49 +0,0 @@
-Description: Enable display manager module, allowing autologins to work 
-   * Enable displaymanager module, fixing autologin options
-     (Closes: #934503, #934504)
-Author: Jonathan Carter <jcc@debian.org>
-Bug-Debian: https://bugs.debian.org/934503
-Bug-Debian: https://bugs.debian.org/934504
-Last-Update: 2020-07-15
-
--- /dev/null
-+++ calamares-settings-debian-10.0.20/calamares/modules/displaymanager.conf
-@@ -0,0 +1,28 @@
-+# Configure one or more display managers (e.g. SDDM)
-+# with a "best effort" approach.
-+---
-+#The DM module attempts to set up all the DMs found in this list, in that precise order.
-+#It also sets up autologin, if the feature is enabled in globalstorage.
-+#The displaymanagers list can also be set in globalstorage, and in that case it overrides anything set up here.
-+displaymanagers:
-+  - slim
-+  - sddm
-+  - lightdm
-+  - gdm
-+  - mdm
-+  - lxdm
-+  - kdm
-+
-+#Enable the following settings to force a desktop environment in your displaymanager configuration file:
-+#defaultDesktopEnvironment:
-+#    executable: "startkde"
-+#    desktopFile: "plasma"
-+
-+#If true, try to ensure that the user, group, /var directory etc. for the
-+#display manager are set up correctly. This is normally done by the distribution
-+#packages, and best left to them. Therefore, it is disabled by default.
-+basicSetup: false
-+
-+#If true, setup autologin for openSUSE. This only makes sense on openSUSE
-+#derivatives or other systems where /etc/sysconfig/displaymanager exists.
-+sysconfigSetup: false
--- calamares-settings-debian-10.0.20.orig/calamares/settings.conf
-+++ calamares-settings-debian-10.0.20/calamares/settings.conf
-@@ -36,6 +36,7 @@ sequence:
-   - keyboard
-   - localecfg
-   - users
-+  - displaymanager
-   - networkcfg
-   - hwclock
-   - services-systemd
@@ -1,26 +0,0 @@
-Description: fix umask for initramfs permissions
- By default, initramfs is world-readable. This configures a snippet
- to ensure that the initramfs that will be generated is only accessable
- by root.
-Author: Jonathan Carter <jcc@debian.org>
-Bug-Debian: https://bugs.debian.org/931373
-Bug: https://github.com/calamares/calamares/issues/1191
-Last-Update: 2019-07-08
-
--- calamares-settings-debian-10.0.20.orig/scripts/bootloader-config
-+++ calamares-settings-debian-10.0.20/scripts/bootloader-config
-@@ -2,6 +2,14 @@
- 
- CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
- 
-+# Set secure permissions for the initramfs if we're configuring
-+# full-disk-encryption. The initramfs is re-generated later in the
-+# installation process so we only set the permissions snippet without
-+# regenerating the initramfs right now:
-+if [ "$(mount | grep $CHROOT" " | cut -c -16)" = "/dev/mapper/luks" ]; then
-+    echo "UMASK=0077" > $CHROOT/etc/initramfs-tools/conf.d/initramfs-permissions
-+fi
-+
- echo "Running bootloader-config..."
- 
- if [ -d /sys/firmware/efi/efivars ]; then
@@ -1,3 +0,0 @@
-fix-initramfs-permissions
-enable-displaymanagers-module
-use-xdg-user-dir
@@ -1,48 +0,0 @@
-Description: Use xdg-user-dir to specify Desktop directory
- Desktop directory was hardcoded to ~/Desktop, but that path
- will change depending on the user's language.
- .
- With this patch we user xdg-user-dir to set the Desktop directory
- so that it's correct regardless of language.
-Author: Jonathan Carter <jcc@debian.org>
-Bug-Debian: https://bugs.debian.org/959541
-Last-Update: 2020-07-15
-
--- calamares-settings-debian-10.0.20.orig/add-calamares-desktop-icon
-+++ calamares-settings-debian-10.0.20/add-calamares-desktop-icon
-@@ -2,24 +2,26 @@
- # Creates an "Install Debian" icon on the live session tested with:
- # Xfce, LXDE, LXqt, Gnome, KDE, Mate, Cinnamon
- 
-+# We query xdg-user-dir because the Desktop directory has different
-+# names for different languages
-+DESKTOP=$(xdg-user-dir DESKTOP)
- 
- # Create ~/Desktop just in case this runs before the xdg folder
- # creation script.
-mkdir -p ~/Desktop
-
-+mkdir -p $DESKTOP
- 
- # Among the Debian desktop environments, LXDE is the only one
- # that behaves completely different.
- if [ -f /usr/bin/lxsession ]; then
-    echo "[Desktop Entry]" > ~/Desktop/install-debian.desktop
-    echo "Type=Link" >> ~/Desktop/install-debian.desktop
-    echo "Name=Install Debian" >> ~/Desktop/install-debian.desktop
-    echo "Icon=install-debian" >> ~/Desktop/install-debian.desktop
-+    echo "[Desktop Entry]" > $DESKTOP/install-debian.desktop
-+    echo "Type=Link" >> $DESKTOP/install-debian.desktop
-+    echo "Name=Install Debian" >> $DESKTOP/install-debian.desktop
-+    echo "Icon=install-debian" >> $DESKTOP/install-debian.desktop
-     echo "URL=/usr/share/applications/install-debian.desktop" \
-          >> ~/Desktop/install-debian.desktop
-+          >> $DESKTOP/install-debian.desktop
- else
-    cp /usr/share/applications/install-debian.desktop ~/Desktop
-+    cp /usr/share/applications/install-debian.desktop $DESKTOP
-     # Xfce needs this executable otherwise it complains, everything
-     # else doesn't seem to care either way.
-    chmod +x ~/Desktop/install-debian.desktop
-+    chmod +x $DESKTOP/install-debian.desktop
- fi
@@ -0,0 +1,3 @@
+---
+Repository: https://salsa.debian.org/live-team/calamares-settings-debian.git
+Repository-Browse: https://salsa.debian.org/live-team/calamares-settings-debian
@@ -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
@@ -2,20 +2,26 @@

 CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")

-# Set secure permissions for the initramfs if we're configuring
+# Install luks utilities if needed.
+# Also, set secure permissions for the initramfs if we're configuring
 # full-disk-encryption. The initramfs is re-generated later in the
 # installation process so we only set the permissions snippet without
 # regenerating the initramfs right now:
 if [ "$(mount | grep $CHROOT" " | cut -c -16)" = "/dev/mapper/luks" ]; then
    echo "UMASK=0077" > $CHROOT/etc/initramfs-tools/conf.d/initramfs-permissions
+    chroot $CHROOT apt-get -y install cryptsetup-initramfs cryptsetup keyutils
 fi

 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 cryptsetup keyutils
+    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 cryptsetup keyutils
+    DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc
 fi
+
+# Re-enable os-prober:
+sed -i "s/#GRUB_DISABLE_OS_PROBER=false/# OS_PROBER re-enabled by Debian Calamares installation:\nGRUB_DISABLE_OS_PROBER=false/g" $CHROOT/etc/default/grub
+chroot $CHROOT /usr/sbin/update-grub
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
+
+if [ "$1" = "-u" ]; then
+    rm $CHROOT/etc/dpkg/dpkg.cfg.d/calamares-force-unsafe-io
+    sync
+    exit 0
+fi
+
+echo "force-unsafe-io" > $CHROOT/etc/dpkg/dpkg.cfg.d/calamares-force-unsafe-io
+
+exit 0
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# Writes the final sources.list file
+#
+
+CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
+RELEASE="trixie"
+
+cat << EOF > $CHROOT/etc/apt/sources.list
+# See https://wiki.debian.org/SourcesList for more information.
+deb http://deb.debian.org/debian $RELEASE main non-free-firmware
+deb-src http://deb.debian.org/debian $RELEASE main non-free-firmware
+
+deb http://deb.debian.org/debian $RELEASE-updates main non-free-firmware
+deb-src http://deb.debian.org/debian $RELEASE-updates main non-free-firmware
+
+deb http://security.debian.org/debian-security/ $RELEASE-security main non-free-firmware
+deb-src http://security.debian.org/debian-security/ $RELEASE-security main non-free-firmware
+
+# Backports allow you to install newer versions of software made available for this release
+deb http://deb.debian.org/debian $RELEASE-backports main non-free-firmware
+deb-src http://deb.debian.org/debian $RELEASE-backports main non-free-firmware
+EOF
+
+exit 0
@@ -1,8 +1,16 @@
 #!/bin/sh

 CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
-MEDIUM_PATH="/run/live/medium"
-RELEASE="bullseye"
+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
@@ -1,15 +0,0 @@
-#!/bin/sh
-###
-# Wrapper for running calamares on Debian live media
-###
-
-# Stale file left behind by live-build that messes with partitioning
-sudo mv /etc/fstab /etc/fstab.orig.calamares
-
-# Access control to run calamares as root for xwayland
-xhost +si:localuser:root
-pkexec calamares
-xhost -si:localuser:root
-
-# Restore stale fstab, for what it's worth
-sudo mv /etc/fstab.orig.calamares /etc/fstab
@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# Writes the final sources.list file
-#
-
-CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
-RELEASE="bullseye"
-
-cat << EOF > $CHROOT/etc/apt/sources.list
-# See https://wiki.debian.org/SourcesList for more information.
-deb http://deb.debian.org/debian $RELEASE main
-deb-src http://deb.debian.org/debian $RELEASE main
-
-deb http://deb.debian.org/debian $RELEASE-updates main
-deb-src http://deb.debian.org/debian $RELEASE-updates main
-
-deb http://security.debian.org/debian-security/ $RELEASE/updates main
-deb-src http://security.debian.org/debian-security/ $RELEASE/updates main
-EOF
-
-exit 0
Author	SHA1	Message	Date
Jonathan Carter	594e4cbbf7	New release	2025-08-13 21:37:35 +02:00
Jonathan Carter	a1a3091959	Fix bug	2025-07-13 23:53:18 +02:00
Jonathan Carter	69e280a098	Add rsync dependency	2025-01-06 12:17:46 +02:00
Jonathan Carter	8645233e34	New upstream release	2024-12-20 15:06:49 +02:00
Jonathan Carter	0bb7342e32	New upstream release	2024-08-23 18:01:31 +02:00
Jonathan Carter	1cb140df49	New upstream release	2024-08-23 18:00:27 +02:00
Jonathan Carter	6d8fd9ed93	New upstream release	2024-08-22 19:01:41 +02:00
Jonathan Carter	68ca4cadfb	New upstream release	2024-07-22 15:54:27 +09:00
Jonathan Carter	1457f700d0	Attempt to fix encryption	2024-07-22 12:39:33 +09:00
Jonathan Carter	f1eaade778	New upstream release	2024-06-21 18:29:43 +02:00
Jonathan Carter	1812e99279	New upstream release	2024-06-21 18:28:53 +02:00
Jonathan Carter	939d291d4d	Update watch file	2024-06-19 11:02:06 +02:00
Jonathan Carter	dbd5ea6632	Update watch file	2024-06-19 11:01:48 +02:00
Jonathan Carter	c620eda931	New release	2024-02-11 14:54:29 +02:00
Jonathan Carter	2b4012a6cd	make desktop launcher translation safer	2023-09-06 12:58:15 +05:30
Jonathan Carter	739cba6c49	New release: Fix /dev mount crash	2023-08-28 19:18:52 +02:00
Jonathan Carter	86b6ea8f4f	New upstream release	2023-08-25 22:01:36 +02:00
Jonathan Carter	ad0aeffc52	New upstream release	2023-08-24 17:33:04 +02:00
Jonathan Carter	77d2a2c381	New upstream release	2023-08-24 17:27:59 +02:00
Jonathan Carter	291444b863	New upstream release	2023-05-04 21:32:27 +02:00
Jonathan Carter	64a2ef74ec	os-prober / grub stuff	2023-05-04 20:42:44 +02:00
Jonathan Carter	c14e3710e8	New upstream release	2023-03-06 19:26:38 +02:00
Jonathan Carter	02f1f852cc	New upstream release	2023-03-06 12:35:42 +02:00
Jonathan Carter	3e977929fb	New release	2022-08-02 09:37:49 +02:00
Jonathan Carter	b348bf4fb8	New upstream release	2022-05-19 14:51:59 +02:00
Jonathan Carter	440efe3275	New release	2022-05-12 21:07:10 +02:00
Jonathan Carter	f06d21fe19	Merge branch 'lintian-fixes' into 'master' Fix some issues reported by lintian See merge request live-team/calamares-settings-debian-packaging!1	2022-02-18 09:13:41 +00:00
Debian Janitor	a485f47a54	Update standards version to 4.6.0, no changes needed. Changes-By: lintian-brush Fixes: lintian: out-of-date-standards-version See-also: https://lintian.debian.org/tags/out-of-date-standards-version.html	2021-10-12 20:09:16 +00:00
Debian Janitor	8773ee70d0	Set upstream metadata fields: Repository, Repository-Browse. Changes-By: lintian-brush Fixes: lintian: upstream-metadata-file-is-missing See-also: https://lintian.debian.org/tags/upstream-metadata-file-is-missing.html Fixes: lintian: upstream-metadata-missing-repository See-also: https://lintian.debian.org/tags/upstream-metadata-missing-repository.html	2021-10-12 20:09:15 +00:00
Jonathan Carter	06541f170d	Fix security entries in sources.list	2021-09-06 08:46:17 +02:00
Jonathan Carter	23079c258a	New upstream release	2020-11-11 14:55:50 +02:00
Jonathan Carter	a5414fb381	New upstream release	2020-10-21 09:33:30 +02:00
				`@@ -0,0 +1 @@`
				`calamares-settings-debian_14.0.1-1_source.buildinfo utils optional`