From b6e0b26d5938c1567fd496a1c4d53fd1211ce6d7 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Thu, 13 Aug 2020 18:56:10 +0000
Subject: user/sddm: Fix logind usage and don't crash if sddm user exists

---
 user/sddm/APKBUILD          | 2 ++
 user/sddm/sddm.post-install | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'user/sddm')

diff --git a/user/sddm/APKBUILD b/user/sddm/APKBUILD
index 9aaa10397..78ca0f8d5 100644
--- a/user/sddm/APKBUILD
+++ b/user/sddm/APKBUILD
@@ -34,6 +34,8 @@ build() {
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
 		-DENABLE_JOURNALD=OFF \
+		-DNO_SYSTEMD=ON \
+		-DUSE_ELOGIND=ON \
 		-DUID_MIN=500 \
 		-DUID_MAX=65000 \
 		${CMAKE_CROSSOPTS} .
diff --git a/user/sddm/sddm.post-install b/user/sddm/sddm.post-install
index 3e3850cde..7078e3be2 100644
--- a/user/sddm/sddm.post-install
+++ b/user/sddm/sddm.post-install
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-useradd -G video -c "Display manager user" -d /var/lib/sddm -m -r -s /sbin/nologin -U sddm
+useradd -G video -c "Display manager user" -d /var/lib/sddm -m -r -s /sbin/nologin -U sddm || exit 0
-- 
cgit v1.2.3-70-g09d2