summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2020-08-13 18:56:10 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2020-08-13 18:56:10 +0000
commitb6e0b26d5938c1567fd496a1c4d53fd1211ce6d7 (patch)
treee3ff14280f7936750dd91b1907624be8d29b37e3
parentb17c896452101db63f84a6b9535ef170aad9e3e9 (diff)
downloadpackages-b6e0b26d5938c1567fd496a1c4d53fd1211ce6d7.tar.gz
packages-b6e0b26d5938c1567fd496a1c4d53fd1211ce6d7.tar.bz2
packages-b6e0b26d5938c1567fd496a1c4d53fd1211ce6d7.tar.xz
packages-b6e0b26d5938c1567fd496a1c4d53fd1211ce6d7.zip
user/sddm: Fix logind usage and don't crash if sddm user exists
-rw-r--r--user/sddm/APKBUILD2
-rw-r--r--user/sddm/sddm.post-install2
2 files changed, 3 insertions, 1 deletions
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