Merge

2020-08-02 18:56:59 +02:00
22 changed files with 156 additions and 285 deletions
@@ -1,47 +1,3 @@
-[ 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
- * 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 +0,0 @@
---
-type:       "job"
-name:       "dpkg-unsafe-io-undo"
-interface:  "process"
-command:    "/usr/sbin/dpkg-unsafe-io -u"
-timeout:    600
@@ -1,6 +0,0 @@
---
-type:       "job"
-name:       "dpkg-unsafe-io"
-interface:  "process"
-command:    "/usr/sbin/dpkg-unsafe-io"
-timeout:    600
@@ -1,30 +1,23 @@
 ---
 componentName:   debian
 welcomeStyleCalamares: true
-welcomeExpandingLogo: true
-windowExpanding: normal
-windowSize: 800px,520px
-windowPlacement: center

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

 images:
    productLogo:         "debian-logo.png"
    productIcon:         "debian-logo.png"
    productWelcome:      "welcome.png"
-    # productWallpaper:  "wallpaper.png"

 slideshow:               "show.qml"

@@ -32,6 +25,3 @@ style:
   sidebarBackground:    "#2c3133"
   sidebarText:          "#FFFFFF"
   sidebarTextSelect:    "#4d7079"
-   sidebarTextSelect:    "#292F34"
-
-slideshowAPI: 2
@@ -40,8 +40,8 @@ Presentation
        Text {
            anchors.horizontalCenter: background1.horizontalCenter
            anchors.top: background1.bottom
-            text: qsTr("Welcome to Debian GNU/Linux.<br/>"+
-                  "The rest of the installation is automated and should complete in a few minutes.")
+            text: "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
@@ -6,10 +6,3 @@ 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
-
@@ -5,41 +5,8 @@
 # "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules
 modules-search: [ local, /usr/lib/calamares/modules ]

-# 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.
@@ -62,7 +29,6 @@ sequence:
  - partition
  - mount
  - unpackfs
-  - dpkg-unsafe-io
  - sources-media
  - machineid
  - fstab
@@ -82,7 +48,6 @@ sequence:
  - plymouthcfg
  - initramfscfg
  - initramfs
-  - dpkg-unsafe-io-undo
  - sources-media-unmount
  - sources-final
  - umount
@@ -1,133 +1,22 @@
-calamares-settings-debian (12.0.8-1) unstable; urgency=medium
+calamares-settings-debian (10.0.20-1+deb10u3) buster; urgency=medium

-  * New upstream release
-    - Make grub changes in the correct place (within the chroot)
+  * Use xdg-user-dir to specify Desktop directory
+    (Closes: #959541)

- -- Jonathan Carter <jcc@debian.org>  Wed, 26 Apr 2023 14:25:34 +0200
+ -- Jonathan Carter <jcc@debian.org>  Wed, 15 Jul 2020 18:15:49 +0200

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

-  * New upstream release
-    - Re-enable os-prober
+  * Fix type in previous entry (s/desk/disk)
+  * Enable displaymanager module, fixing autologin options
+    (Closes: #934503, #934504)

- -- Jonathan Carter <jcc@debian.org>  Wed, 26 Apr 2023 13:43:01 +0200
+ -- Jonathan Carter <jcc@debian.org>  Wed, 15 Jul 2020 17:15:11 +0200

-calamares-settings-debian (12.0.5-2) unstable; urgency=medium
+calamares-settings-debian (10.0.20-1+deb10u1) buster; 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)
+  * Fix permissions for initramfs image when full-disk encryption
+    is enabled. (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.6.0
+Standards-Version: 4.5.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,7 +14,6 @@ Architecture: all
 Depends: calamares,
         cryptsetup,
         keyutils,
-         pkexec,
         qml-module-qtquick-window2,
         qml-module-qtquick2,
         ${misc:Depends}
@@ -0,0 +1,49 @@
+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
@@ -0,0 +1,26 @@
+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
@@ -0,0 +1,3 @@
+fix-initramfs-permissions
+enable-displaymanagers-module
+use-xdg-user-dir
@@ -0,0 +1,48 @@
+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
@@ -1,3 +0,0 @@
---
-Repository: https://salsa.debian.org/live-team/calamares-settings-debian.git
-Repository-Browse: https://salsa.debian.org/live-team/calamares-settings-debian
@@ -6,17 +6,6 @@
 # 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,7 +19,3 @@ 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
@@ -1,13 +0,0 @@
-#!/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,22 +4,18 @@
 #

 CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
-RELEASE="bookworm"
+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 non-free-firmware
-deb-src http://deb.debian.org/debian $RELEASE main non-free-firmware
+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 non-free-firmware
-deb-src http://deb.debian.org/debian $RELEASE-updates 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://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
+deb http://security.debian.org/debian-security/ $RELEASE/updates main
+deb-src http://security.debian.org/debian-security/ $RELEASE/updates main
 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="bookworm"
+RELEASE="bullseye"

 if [ "$1" = "-u" ]; then
    umount $CHROOT/$MEDIUM_PATH