From 686f614f64993b2aa9969ee1a54e77a038b8e280 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Wed, 18 May 2016 13:30:08 +0200
Subject: SDDM user exists in Slackware now; create the homedirectory properly.

---
 kde/build/sddm-qt5     |  2 +-
 kde/doinst.sh/sddm-qt5 | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/kde/build/sddm-qt5 b/kde/build/sddm-qt5
index 0cfbf08..00750ed 100644
--- a/kde/build/sddm-qt5
+++ b/kde/build/sddm-qt5
@@ -1 +1 @@
-2
+3
diff --git a/kde/doinst.sh/sddm-qt5 b/kde/doinst.sh/sddm-qt5
index d98a226..c1364e2 100644
--- a/kde/doinst.sh/sddm-qt5
+++ b/kde/doinst.sh/sddm-qt5
@@ -43,15 +43,17 @@ You'll have add a 'sddm' user manually.  Run these commands (as root):
 and select a free value for UID that is below 500 (check /etc/passwd)
 Then, run an "upgradepkg --reinstall" of this sddm-qt5 package so that it can run the rest of the install script.
 EOT
-  else
-    chroot . passwd -l sddm > /dev/null
-    chroot . gpasswd -a sddm video > /dev/null
   fi
 fi
 
 # Without a homedirectory, sddm will not start:
 chroot . mkdir -p $sddmhome
-chroot . chown -R sddm:sddm $sddmhome > /dev/null
+chroot . chown -R ${sddmuid}:${sddmgid} $sddmhome 1>/dev/null
+
+# Execute this regardless of the pre-existence of the sddm account:
+chroot . usermod -d $sddmhome sddm 1>/dev/null
+chroot . passwd -l sddm 1>/dev/null
+chroot . gpasswd -a sddm video 1>/dev/null
 
 # Generate a new configuration file if it does not exist:
 chroot . sddm --example-config > etc/sddm.conf.new
-- 
cgit v1.2.3