os-prober / grub stuff

New upstream release
2023-05-04 20:42:44 +02:00 · 2023-03-06 19:26:38 +02:00 · 2023-03-06 12:35:42 +02:00 · 2022-08-02 09:37:49 +02:00 · 2022-05-19 14:51:59 +02:00 · 2022-05-12 21:07:10 +02:00
17 changed files with 175 additions and 16 deletions
@@ -1,3 +1,39 @@
+[ 10.0.8 ]
+
+ * Do grub work within the chroot
+
+[ 10.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
@@ -0,0 +1,6 @@
+---
+type:       "job"
+name:       "dpkg-unsafe-io-undo"
+interface:  "process"
+command:    "/usr/sbin/dpkg-unsafe-io -u"
+timeout:    600
@@ -0,0 +1,6 @@
+---
+type:       "job"
+name:       "dpkg-unsafe-io"
+interface:  "process"
+command:    "/usr/sbin/dpkg-unsafe-io"
+timeout:    600
@@ -9,15 +9,15 @@ windowPlacement: center
 strings:
    productName:         Debian GNU/Linux
    shortProductName:    Debian
-    version:             11 (bullseye)
-    shortVersion:        11
-    versionedName:       Debian 11 (bullseye)
-    shortVersionedName:  Debian 11
+    version:             12 (bookworm)
+    shortVersion:        12
+    versionedName:       Debian 12 (bookworm)
+    shortVersionedName:  Debian 12
    bootloaderEntryName: Debian
    productUrl:          https://debian.org
    supportUrl:          https://www.debian.org/support
    knownIssuesUrl:      https://bugs.debian.org
-    releaseNotesUrl:     https://www.debian.org/releases/bullseye/releasenotes
+    releaseNotesUrl:     https://www.debian.org/releases/bookworm/releasenotes
    donateUrl:           https://www.debian.org

 images:
@@ -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
@@ -62,6 +62,7 @@ sequence:
  - partition
  - mount
  - unpackfs
+  - dpkg-unsafe-io
  - sources-media
  - machineid
  - fstab
@@ -81,6 +82,7 @@ sequence:
  - plymouthcfg
  - initramfscfg
  - initramfs
+  - dpkg-unsafe-io-undo
  - sources-media-unmount
  - sources-final
  - umount
@@ -1,3 +1,76 @@
+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
@@ -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.0
 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
@@ -14,6 +14,7 @@ Architecture: all
 Depends: calamares,
         cryptsetup,
         keyutils,
+         pkexec,
         qml-module-qtquick-window2,
         qml-module-qtquick2,
         ${misc:Depends}
@@ -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
@@ -6,6 +6,17 @@
 # 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
@@ -19,3 +19,7 @@ else
    echo " * install grub... (bios)"
    DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc cryptsetup keyutils
 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
@@ -4,18 +4,22 @@
 #

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

 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 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
-deb-src http://deb.debian.org/debian $RELEASE-updates main
+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-updates main
-deb-src http://security.debian.org/debian-security/ $RELEASE-updates main
+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
@@ -2,7 +2,7 @@

 CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
 MEDIUM_PATH="/run/live/medium"
-RELEASE="bullseye"
+RELEASE="bookworm"

 if [ "$1" = "-u" ]; then
    umount $CHROOT/$MEDIUM_PATH
Author	SHA1	Message	Date
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