From 648b70c14bbbd6506d2c84f556afe2dfcdfed372 Mon Sep 17 00:00:00 2001
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
Date: Sun, 11 Apr 2021 00:16:46 +0300
Subject: [PATCH] Use GDM

---
 main.ks     | 21 +++++++++++++--------
 packages.ks |  2 +-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/main.ks b/main.ks
index 12d4a12..97c2d29 100644
--- a/main.ks
+++ b/main.ks
@@ -5,7 +5,7 @@ firewall --disabled
 firstboot --enabled
 
 # Enable/Disable services
-services --enabled=lightdm,avahi-daemon,cpupower,irqbalance,dbus,sshd,cups,smb,wsdd,systemd-resolved,NetworkManager
+services --enabled=gdm,avahi-daemon,cpupower,irqbalance,dbus,sshd,cups,smb,wsdd,systemd-resolved,NetworkManager
 
 # partition
 part / --size 12268 --fstype ext4
@@ -62,14 +62,19 @@ find /boot -name 'vmlinuz-*' | sort -u | while read -r line ; do
 done
 find /boot -name 'initrd-*' -print
 
-# autologin lightdm and session default xfce
-cat > /etc/anaconda-scripts.d/livecd-init/rosa-xfce-live-lightdm.sh << 'EOF'
-CONF=/etc/lightdm/lightdm.conf.d/rosa-xfce-live.conf
-echo "autologin-user=live" >> "$CONF"
-echo "autologin-user-timeout=0" >> "$CONF"
-echo "user-session=xfce" >> "$CONF"
+# https://help.gnome.org/admin/gdm/stable/configuration.html.en#sessionconfig
+# https://help.gnome.org/admin/system-admin-guide/stable/login-automatic.html.en
+cat > /etc/anaconda-scripts.d/livecd-init/rosa-xfce-gdm-setup.sh << 'EOF'
+echo "[Desktop]
+Session=xfce" > /home/live/.dmrc
+chown live:live /home/live/.dmrc
+echo "[daemon]
+AutomaticLoginEnable=True
+AutomaticLogin=live" > /etc/gdm/custom.conf
 EOF
-chmod +x /etc/anaconda-scripts.d/livecd-init/rosa-xfce-live-lightdm.sh
+chmod +x /etc/anaconda-scripts.d/livecd-init/rosa-xfce-gdm-setup.sh
+
+( cd /etc/systemd/system && ln -sf gdm.service display-manager.service )
 
 %end
 
diff --git a/packages.ks b/packages.ks
index b31bbc3..53318a5 100644
--- a/packages.ks
+++ b/packages.ks
@@ -22,7 +22,7 @@ locales-de
 locales-fr
 locales-tr
 locales-pl
-lightdm
+gdm
 git-core
 htop
 hw-probe