From 767096ac8997fdc6401f3310e71ee33c93a6a0b6 Mon Sep 17 00:00:00 2001
From: Richard Neese <r.neese@gmail.com>
Date: Thu, 30 Jun 2022 19:02:48 -0400
Subject: [PATCH] Fix for gnome desktops to use lightdm and slick-greeter 
 (#3947)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* change layout

* fixing gnome to use lightdm  lightdm-settings and slick-greeter

Co-authored-by: Igor Pečovnik <igorpecovnik@users.noreply.github.com>
---
 .../desktop/bullseye/environments/gnome/config_base/packages  | 1 +
 config/desktop/focal/environments/gnome/config_base/packages  | 3 +--
 config/desktop/jammy/environments/gnome/config_base/packages  | 1 +
 config/desktop/sid/environments/gnome/config_base/packages    | 4 +++-
 .../sid/environments/gnome/config_base/packages.uninstall     | 1 +
 config/desktop/sid/environments/gnome/debian/postinst         | 2 +-
 6 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 config/desktop/sid/environments/gnome/config_base/packages.uninstall

diff --git a/config/desktop/bullseye/environments/gnome/config_base/packages b/config/desktop/bullseye/environments/gnome/config_base/packages
index f749dd2d7a..6458536e99 100644
--- a/config/desktop/bullseye/environments/gnome/config_base/packages
+++ b/config/desktop/bullseye/environments/gnome/config_base/packages
@@ -158,6 +158,7 @@ libxtst6
 libxxf86dga1
 libyelp0
 lightdm
+lightdm-settings
 mutter
 mutter-common
 nautilus
diff --git a/config/desktop/focal/environments/gnome/config_base/packages b/config/desktop/focal/environments/gnome/config_base/packages
index 8062fbaa28..467d6e23ea 100644
--- a/config/desktop/focal/environments/gnome/config_base/packages
+++ b/config/desktop/focal/environments/gnome/config_base/packages
@@ -173,8 +173,7 @@ libxtst6
 libxxf86dga1
 libyelp0
 lightdm
-lightdm-gtk-greeter
-lightdm-gtk-greeter-settings
+lightdm-dettings
 linux-sound-base
 mutter
 mutter-common
diff --git a/config/desktop/jammy/environments/gnome/config_base/packages b/config/desktop/jammy/environments/gnome/config_base/packages
index d472849828..2d78318dc5 100644
--- a/config/desktop/jammy/environments/gnome/config_base/packages
+++ b/config/desktop/jammy/environments/gnome/config_base/packages
@@ -96,6 +96,7 @@ libxtst6
 libxxf86dga1
 libyelp0
 lightdm
+lightdm-settings
 linux-sound-base
 mutter
 mutter-common
diff --git a/config/desktop/sid/environments/gnome/config_base/packages b/config/desktop/sid/environments/gnome/config_base/packages
index 9002b0e403..a67fcdcb84 100644
--- a/config/desktop/sid/environments/gnome/config_base/packages
+++ b/config/desktop/sid/environments/gnome/config_base/packages
@@ -14,7 +14,6 @@ fonts-urw-base35
 foomatic-db-compressed-ppds
 gcr
 gdebi
-gdm3
 genisoimage
 ghostscript
 ghostscript-x
@@ -84,6 +83,8 @@ libxmuu1
 libxtst6
 libxxf86dga1
 libyelp0
+lightdm
+lightdm-settings
 mutter
 mutter-common
 nautilus
@@ -106,6 +107,7 @@ python3-debian
 python3-distutils
 python3-distutils-extra
 python3-yaml
+slick-greeter
 qalculate-gtk
 software-properties-gtk
 spice-vdagent
diff --git a/config/desktop/sid/environments/gnome/config_base/packages.uninstall b/config/desktop/sid/environments/gnome/config_base/packages.uninstall
new file mode 100644
index 0000000000..ec0762d751
--- /dev/null
+++ b/config/desktop/sid/environments/gnome/config_base/packages.uninstall
@@ -0,0 +1 @@
+gdm3
\ No newline at end of file
diff --git a/config/desktop/sid/environments/gnome/debian/postinst b/config/desktop/sid/environments/gnome/debian/postinst
index 22b150e1e2..9694f48588 100644
--- a/config/desktop/sid/environments/gnome/debian/postinst
+++ b/config/desktop/sid/environments/gnome/debian/postinst
@@ -1,6 +1,6 @@
 # overwrite stock lightdm greeter configuration
 if [ -d /etc/armbian/lightdm ]; then cp -R /etc/armbian/lightdm /etc/; fi
-#if [ -f /etc/lightdm/slick-greeter.conf ]; then sed -i 's/armbian03-Dre0x-Minum-dark-blurred-3840x2160.jpg/armbian-4k-black-psycho-gauss.jpg/g' /etc/lightdm/slick-greeter.conf; fi
+
 
 # Disable Pulseaudio timer scheduling which does not work with sndhdmi driver
 if [ -f /etc/pulse/default.pa ]; then sed "s/load-module module-udev-detect$/& tsched=0/g" -i  /etc/pulse/default.pa; fi