Merge

2020-08-02 18:56:59 +02:00
13 changed files with 142 additions and 125 deletions
@@ -1,11 +1,3 @@
-[ 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,14 +1,10 @@
 ---
 componentName:   debian
 welcomeStyleCalamares: true
-welcomeExpandingLogo: true
-windowExpanding: normal
-windowSize: 800px,520px
-windowPlacement: center

 strings:
    productName:         Debian GNU/Linux
-    shortProductName:    Debian
+    shortProductName:    Debian testing
    version:             11 (bullseye)
    shortVersion:        11
    versionedName:       Debian 11 (bullseye)
@@ -16,15 +12,12 @@ strings:
    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
-    donateUrl:           https://www.debian.org

 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
@@ -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.
@@ -1,73 +1,22 @@
-calamares-settings-debian (11.0.5-2) unstable; urgency=medium
+calamares-settings-debian (10.0.20-1+deb10u3) buster; urgency=medium

-  * Add supplimental information to previous changelog entry
+  * Use xdg-user-dir to specify Desktop directory
+    (Closes: #959541)

- -- Jonathan Carter <jcc@debian.org>  Mon, 26 Jul 2021 10:27:12 +0200
+ -- Jonathan Carter <jcc@debian.org>  Wed, 15 Jul 2020 18:15:49 +0200

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

-  * New upstream release
-    - Corrects the apt sources for security updates (Closes: #991474)
+  * Fix type in previous entry (s/desk/disk)
+  * Enable displaymanager module, fixing autologin options
+    (Closes: #934503, #934504)

- -- Jonathan Carter <jcc@debian.org>  Sun, 25 Jul 2021 14:10:24 +0200
+ -- Jonathan Carter <jcc@debian.org>  Wed, 15 Jul 2020 17:15:11 +0200

-calamares-settings-debian (11.0.4-1) unstable; urgency=medium
+calamares-settings-debian (10.0.20-1+deb10u1) buster; 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

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