diff --git a/0001-systemd-disable-GVFS-support.patch b/0001-systemd-disable-GVFS-support.patch deleted file mode 100644 index d25698c..0000000 --- a/0001-systemd-disable-GVFS-support.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 7933036127ff707718e45b805937d23d85b25c6d Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Tue, 31 May 2016 16:12:38 -0400 -Subject: [PATCH] systemd: disable GVFS support - -accountsservice doesn't need support for GVFS modules, -and those modules lead to /root/.cache getting created -at startup. - -accountsservice runs as root, but shouldn't be touching /root. - -This commit disables GVFS for accountsservice ---- - data/accounts-daemon.service.in | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/data/accounts-daemon.service.in b/data/accounts-daemon.service.in -index feedf3e..2f5fe33 100644 ---- a/data/accounts-daemon.service.in -+++ b/data/accounts-daemon.service.in -@@ -1,21 +1,24 @@ - [Unit] - Description=Accounts Service - - # In order to avoid races with identity-providing services like SSSD or - # winbind, we need to ensure that Accounts Service starts after - # nss-user-lookup.target - After=nss-user-lookup.target - Wants=nss-user-lookup.target - - [Service] - Type=dbus - BusName=org.freedesktop.Accounts - ExecStart=@libexecdir@/accounts-daemon - StandardOutput=syslog -+Environment=GVFS_DISABLE_FUSE=1 -+Environment=GIO_USE_VFS=local -+Environment=GVFS_REMOTE_VOLUME_MONITOR_IGNORE=1 - - [Install] - # We pull this in by graphical.target instead of waiting for the bus - # activation, to speed things up a little: gdm uses this anyway so it is nice - # if it is already around when gdm wants to use it and doesn't have to wait for - # it. - WantedBy=graphical.target --- -2.8.1 - diff --git a/accountsservice.spec b/accountsservice.spec index a483ff2..39dcf91 100644 --- a/accountsservice.spec +++ b/accountsservice.spec @@ -10,7 +10,6 @@ License: GPLv3+ URL: http://www.fedoraproject.org/wiki/Features/UserAccountDialog #VCS: git:git://git.freedesktop.org/accountsservice Source0: http://www.freedesktop.org/software/accountsservice/accountsservice-%{version}.tar.xz -Patch0: 0001-systemd-disable-GVFS-support.patch BuildRequires: glib2-devel BuildRequires: polkit-devel @@ -56,7 +55,6 @@ of these interfaces, based on the useradd, usermod and userdel commands. %prep %setup -q -%patch0 -p1 -b .disable-GVFS-support %build %configure --enable-user-heuristics diff --git a/fix-sssd-race.patch b/fix-sssd-race.patch deleted file mode 100644 index 8f11d82..0000000 --- a/fix-sssd-race.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3d6d125917073b06849c336c93e475a5a43c0dd9 Mon Sep 17 00:00:00 2001 -From: Stephen Gallagher -Date: Fri, 17 Oct 2014 11:43:39 -0400 -Subject: systemd: ensure that accounts service starts after NSS initializes - -The various NSS calls don't give accurate results in some configurations -until midway through boot up. This is because SSSD or winbind (or -whatever) needs to initialize. - -In order to prevent accounts service from using NSS prematurely, we need -to add an ordering constraint between the nss-user-lookup.target and -accountsservice. - -This commit accomplishes this by adding the appropriate Wants= and -After= directives to the accountsservice systemd unit file. - -diff --git a/data/accounts-daemon.service.in b/data/accounts-daemon.service.in -index 105bf6a..feedf3e 100644 ---- a/data/accounts-daemon.service.in -+++ b/data/accounts-daemon.service.in -@@ -1,6 +1,12 @@ - [Unit] - Description=Accounts Service - -+# In order to avoid races with identity-providing services like SSSD or -+# winbind, we need to ensure that Accounts Service starts after -+# nss-user-lookup.target -+After=nss-user-lookup.target -+Wants=nss-user-lookup.target -+ - [Service] - Type=dbus - BusName=org.freedesktop.Accounts --- -cgit v0.10.2 - -