#1 Collection of small fixes to improve user/group handling
Merged 2 years ago by rdieter. Opened 2 years ago by siosm.
rpms/ siosm/sddm rawhide  into  rawhide

@@ -0,0 +1,1 @@ 

+ u sddm - "Simple Desktop Display Manager" /var/lib/sddm

file modified
+8 -7
@@ -64,6 +64,8 @@ 

  Source16: sddm.sysconfig

  # udev rules for disabling plasma-wayland in broken scenarios

  Source17: 61-sddm-plasmawayland.rules

+ # systemd sysusers config

+ Source18:  sddm-systemd-sysusers.conf

  

  Provides: service(graphical-login) = sddm

  
@@ -82,6 +84,7 @@ 

  # verify presence to pull defaults from /etc/login.defs

  BuildRequires:  shadow-utils

  BuildRequires:  systemd

+ BuildRequires:  systemd-rpm-macros

  

  Obsoletes: kde-settings-sddm < 20-5

  
@@ -153,7 +156,8 @@ 

  install -Dpm 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/sddm.conf

  install -Dpm 644 %{SOURCE15} %{buildroot}%{_datadir}/sddm/scripts/README.scripts

  install -Dpm 644 %{SOURCE16} %{buildroot}%{_sysconfdir}/sysconfig/sddm

- mkdir -p %{buildroot}%{_localstatedir}/run/sddm

+ install -Dpm 644 %{SOURCE17} %{buildroot}%{_sysusersdir}/sddm.conf

+ mkdir -p %{buildroot}/run/sddm

  mkdir -p %{buildroot}%{_localstatedir}/lib/sddm

  mkdir -p %{buildroot}%{_sysconfdir}/sddm/

  cp -a %{buildroot}%{_datadir}/sddm/scripts/* \
@@ -168,11 +172,7 @@ 

  touch %{buildroot}%{_sysconfdir}/sddm/hide-wayland-sessions

  

  %pre

- getent group sddm >/dev/null || groupadd -r sddm

- getent passwd sddm >/dev/null || \

-     useradd -r -g sddm -d %{_localstatedir}/lib/sddm -s /sbin/nologin \

-     -c "Simple Desktop Display Manager" sddm

- exit 0

+ %sysusers_create_compat %{SOURCE18}

  

  %post

  %systemd_post sddm.service
@@ -236,7 +236,8 @@ 

  %{_tmpfilesdir}/sddm.conf

  %{_udevrulesdir}/61-sddm-plasmawayland.rules

  %ghost %{_sysconfdir}/sddm/hide-wayland-sessions

- %attr(0711, root, sddm) %dir %{_localstatedir}/run/sddm

+ %{_sysusersdir}/sddm.conf

+ %attr(0711, root, sddm) %dir /run/sddm

  %attr(1770, sddm, sddm) %dir %{_localstatedir}/lib/sddm

  %{_unitdir}/sddm.service

  %{_qt5_archdatadir}/qml/SddmComponents/

file modified
+2
@@ -1,1 +1,3 @@ 

  d /run/sddm 1733 root root -

+ # Workaround for https://pagure.io/fedora-kde/SIG/issue/87

+ Z /var/lib/sddm - sddm sddm - -

Thanks, that looks good (I wasn't aware of some of those new user-related macros).
Not tested though, let's try it out!

Pull-Request has been merged by rdieter

2 years ago