From b0d342eaa3ea67deb0c94220f67aca2001d689e0 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 (cherry picked from commit c29cc4c270421275a7823784f9348167981fa26c) --- Makefile | 2 +- rpm_spec/core-vm.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b1dbda3..8d81d54 100644 --- a/Makefile +++ b/Makefile @@ -284,8 +284,8 @@ install-common: 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)/usr/bin/qubes-desktop-run diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec index 668e966..02bc889 100644 --- a/rpm_spec/core-vm.spec +++ b/rpm_spec/core-vm.spec @@ -506,8 +506,8 @@ rm -f %{name}-%{version} %endif %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