suzanne.soy/qubes-core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

centos: exclude only dconf user profile, keep dpi config

Browse Source 
(cherry picked from commit c29cc4c270)
This commit is contained in:
Marek Marczykowski-Górecki 2018-05-01 15:17:39 +02:00 committed by Frédéric Pierret
parent 3c7c258141
commit b0d342eaa3
No known key found for this signature in database
GPG Key ID: 1DABC232BE02201E
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -284,8 +284,8 @@ install-common:
ifeq ($(findstring CentOS,$(shell cat /etc/redhat-release)),) 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-profile-user $(DESTDIR)/etc/dconf/profile/user
install -D -m 0644 misc/dconf-db-local-dpi $(DESTDIR)/etc/dconf/db/local.d/dpi
endif 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 install -D -m 0755 misc/qubes-desktop-run $(DESTDIR)/usr/bin/qubes-desktop-run

2
rpm_spec/core-vm.spec
View File

@ -506,8 +506,8 @@ rm -f %{name}-%{version}
%endif %endif
%if 0%{?fedora} >= 23 %if 0%{?fedora} >= 23
%config(noreplace) /etc/dconf/profile/user %config(noreplace) /etc/dconf/profile/user
%config(noreplace) /etc/dconf/db/local.d/dpi
%endif %endif
%config(noreplace) /etc/dconf/db/local.d/dpi
/usr/lib/systemd/system/user@.service.d/90-session-stop-timeout.conf /usr/lib/systemd/system/user@.service.d/90-session-stop-timeout.conf
/usr/sbin/qubes-serial-login /usr/sbin/qubes-serial-login
/usr/bin/qvm-copy-to-vm /usr/bin/qvm-copy-to-vm