Fix bug

Add rsync dependency
New upstream release
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 · 2024-08-22 19:01:41 +02:00
26 changed files with 118 additions and 22 deletions
@@ -1,7 +1,37 @@
+[ 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 ]

- * Change order of modules being run to attempt fixing current
-   problems with encrypted setups
+ * Move lukskeyconfig action before fstab
+   (fstab now depends on it being configured)

 [ 13.0.6 ]

@@ -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.

@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -17,25 +17,23 @@ strings:
    productUrl:          https://debian.org
    supportUrl:          https://www.debian.org/support
    knownIssuesUrl:      https://bugs.debian.org
-    releaseNotesUrl:     https://www.debian.org/releases/bookworm/releasenotes
+    releaseNotesUrl:     https://www.debian.org/releases/trixie/releasenotes
    donateUrl:           https://www.debian.org

 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
@@ -8,4 +8,4 @@ ssdExtraMountOptions:
    xfs: discard
    swap: discard
    btrfs: discard,compress=lzo
-crypttabOptions: luks,keyscript=/bin/cat
+crypttabOptions: luks,discard,keyscript=/bin/cat
@@ -4,7 +4,7 @@ showKnownIssuesUrl:     true
 showReleaseNotesUrl:    true

 requirements:
-    requiredStorage:    10
+    requiredStorage:    15
    requiredRam:        1.0
    check:
        - storage
@@ -62,10 +62,10 @@ sequence:
  - partition
  - mount
  - unpackfs
+  - luksbootkeyfile
  - dpkg-unsafe-io
  - sources-media
  - machineid
-  - luksbootkeyfile
  - fstab
  - locale
  - keyboard
@@ -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,3 +1,52 @@
+calamares-settings-debian (13.0.13-1) unstable; urgency=medium
+
+  * New upstream relese
+    - Fix support url (Closes: #1109232)
+
+ -- Jonathan Carter <jcc@debian.org>  Sun, 13 Jul 2025 23:52:19 +0200
+
+calamares-settings-debian (13.0.12-2) unstable; urgency=medium
+
+  * 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
@@ -12,6 +12,7 @@ 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,
@@ -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
@@ -0,0 +1 @@
+calamares-settings-debian_13.0.12-2_source.buildinfo utils optional
@@ -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
@@ -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
Author	SHA1	Message	Date
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
				`@@ -0,0 +1 @@`
				`calamares-settings-debian_13.0.12-2_source.buildinfo utils optional`