From c29cc4c270421275a7823784f9348167981fa26c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Tue, 1 May 2018 15:17:39 +0200 Subject: [PATCH] centos: exclude only dconf user profile, keep dpi config --- Makefile | 2 +- rpm_spec/core-agent.spec.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9f59b36..9a793eb 100644 --- a/Makefile +++ b/Makefile @@ -301,8 +301,8 @@ install-common: install-doc ifeq ($(findstring CentOS,$(shell cat /etc/redhat-release)),) install -D -m 0644 misc/dconf-profile-user $(DESTDIR)/etc/dconf/profile/user - install -D -m 0644 misc/dconf-db-local-dpi $(DESTDIR)/etc/dconf/db/local.d/dpi endif + install -D -m 0644 misc/dconf-db-local-dpi $(DESTDIR)/etc/dconf/db/local.d/dpi install -D -m 0755 misc/qubes-desktop-run $(DESTDIR)$(BINDIR)/qubes-desktop-run diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in index 77bd151..d300694 100644 --- a/rpm_spec/core-agent.spec.in +++ b/rpm_spec/core-agent.spec.in @@ -587,8 +587,8 @@ rm -f %{name}-%{version} %config(noreplace) /etc/dnf/plugins/qubes-hooks.conf %if 0%{?fedora} >= 23 %config(noreplace) /etc/dconf/profile/user -%config(noreplace) /etc/dconf/db/local.d/dpi %endif +%config(noreplace) /etc/dconf/db/local.d/dpi /usr/lib/systemd/system/user@.service.d/90-session-stop-timeout.conf /usr/sbin/qubes-serial-login /usr/bin/qvm-copy-to-vm