From 1fcb9b8dd212ce2677a4c6a340ed5ef813ec2da3 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 11 Oct 2011 15:08:14 +0200 Subject: [PATCH] gdm: gdm-welcome (optionally) should run pam_systemd.so if found, this fixes ACLs with systemd. --- srcpkgs/gdm/INSTALL | 5 ----- srcpkgs/gdm/files/gdm-welcome.pam | 1 + srcpkgs/gdm/template | 3 +-- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/srcpkgs/gdm/INSTALL b/srcpkgs/gdm/INSTALL index fea37b17a35..26ad51ed66a 100644 --- a/srcpkgs/gdm/INSTALL +++ b/srcpkgs/gdm/INSTALL @@ -10,10 +10,5 @@ post) [ ! -d var/cache/gdm ] && mkdir -p var/cache/gdm chown gdm:gdm var/lib/gdm > /dev/null chown -R gdm:gdm var/lib/gdm/.gconf.mandatory - # Check that gdm user also is in the video group. - if groups gdm|grep -vq video; then - usermod -a -G video gdm - echo "Added gdm user to the system video group." - fi ;; esac diff --git a/srcpkgs/gdm/files/gdm-welcome.pam b/srcpkgs/gdm/files/gdm-welcome.pam index 9b872065d6a..e6d585a93e9 100644 --- a/srcpkgs/gdm/files/gdm-welcome.pam +++ b/srcpkgs/gdm/files/gdm-welcome.pam @@ -8,4 +8,5 @@ account required pam_unix.so password required pam_deny.so session required pam_loginuid.so +-session optional pam_systemd.so session optional pam_keyinit.so force revoke diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index 257d7ffab86..5f976868a16 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,7 +1,7 @@ # Template file for 'gdm' pkgname=gdm version=3.2.0 -revision=2 +revision=3 distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz" build_style=gnu_configure configure_args="--disable-schemas-install --disable-scrollkeeper @@ -44,7 +44,6 @@ gtk_iconcache_dirs="/usr/share/icons/hicolor" # Create the 'gdm' system user/group. system_accounts="gdm" gdm_homedir="/var/lib/gdm" -gdm_groups="video" systemd_services="gdm.service" Add_dependency run glibc