From e6ce676a1774e5588701a622d68f34daca437f56 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Thu, 19 Nov 2015 00:39:14 +0100
Subject: SDDM: updated.

---
 kde/build/sddm-qt5     | 1 -
 kde/cmake/sddm-qt5     | 1 +
 kde/doinst.sh/sddm-qt5 | 9 +++++----
 3 files changed, 6 insertions(+), 5 deletions(-)
 delete mode 100644 kde/build/sddm-qt5

(limited to 'kde')

diff --git a/kde/build/sddm-qt5 b/kde/build/sddm-qt5
deleted file mode 100644
index 0cfbf08..0000000
--- a/kde/build/sddm-qt5
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/kde/cmake/sddm-qt5 b/kde/cmake/sddm-qt5
index 808c87e..fe0b89d 100644
--- a/kde/cmake/sddm-qt5
+++ b/kde/cmake/sddm-qt5
@@ -13,5 +13,6 @@ cd build
     -DUSE_QT4:BOOL=FALSE \
     -DUSE_QT5:BOOL=TRUE \
     -DENABLE_JOURNALD:BOOL=OFF \
+    -DENABLE_PAM:BOOL=OFF \
     ..
 
diff --git a/kde/doinst.sh/sddm-qt5 b/kde/doinst.sh/sddm-qt5
index c9f6a8d..d98a226 100644
--- a/kde/doinst.sh/sddm-qt5
+++ b/kde/doinst.sh/sddm-qt5
@@ -30,7 +30,7 @@ EOT
   fi
 fi
 if ! chroot . getent passwd sddm > /dev/null; then
-  useradd -c "SDDM Daemon Owner" -d $sddmhome -u $sddmuid \
+  chroot . useradd -c "SDDM Daemon Owner" -d $sddmhome -u $sddmuid \
     -g sddm -s /bin/false sddm
   res=$?
   if [ $res -ne 0 ]; then
@@ -49,11 +49,12 @@ EOT
   fi
 fi
 
-mkdir -p $sddmhome
-chown -R sddm:sddm $sddmhome > /dev/null
+# Without a homedirectory, sddm will not start:
+chroot . mkdir -p $sddmhome
+chroot . chown -R sddm:sddm $sddmhome > /dev/null
 
 # Generate a new configuration file if it does not exist:
-chroot . sddm --example-config > /etc/sddm.conf.new
+chroot . sddm --example-config > etc/sddm.conf.new
 
 if ! grep -q "Current=breeze" etc/sddm.conf.new ; then
   # Set the KDE5 theme 'breeze' as default, integrates better with Plasma 5:
-- 
cgit v1.2.3