Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,8 @@ install-systemd: install-init
$(DESTDIR)$(SYSLIBDIR)/modules-load.d \
$(DESTDIR)/etc/systemd/system \
$(DESTDIR)$(SYSLIBDIR)/systemd/network \
$(DESTDIR)$(SYSLIBDIR)/systemd/resolved.conf.d/
$(DESTDIR)$(SYSLIBDIR)/systemd/resolved.conf.d/ \
$(DESTDIR)$(SYSLIBDIR)/systemd/user-environment-generators
install -m 0644 $(SYSTEMD_CORE_SERVICES) $(DESTDIR)$(SYSLIBDIR)/systemd/system/
install -m 0644 vm-systemd/qubes-*.timer $(DESTDIR)$(SYSLIBDIR)/systemd/system/
install -m 0644 vm-systemd/75-qubes-vm.preset $(DESTDIR)$(SYSLIBDIR)/systemd/system-preset/
Expand All @@ -166,6 +167,7 @@ install-systemd: install-init
install -m 0644 vm-systemd/80-qubes-vif.link $(DESTDIR)$(SYSLIBDIR)/systemd/network/
install -m 0644 vm-systemd/30_resolved-no-mdns-or-llmnr.conf $(DESTDIR)$(SYSLIBDIR)/systemd/resolved.conf.d/
install -m 0644 vm-systemd/home.mount $(DESTDIR)$(SYSLIBDIR)/systemd/system/
install -m 0755 vm-systemd/user-environment-generators/30-qubes.sh $(DESTDIR)$(SYSLIBDIR)/systemd/user-environment-generators/30-qubes.sh
install -m 0644 vm-systemd/usr-local.mount $(DESTDIR)$(SYSLIBDIR)/systemd/system/

.PHONY: install-sysvinit
Expand Down
1 change: 1 addition & 0 deletions debian/qubes-core-agent.install
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ lib/systemd/system/systemd-nsresourced.socket.d/30_qubes.conf
lib/systemd/resolved.conf.d/30_resolved-no-mdns-or-llmnr.conf
lib/systemd/system/home.mount
lib/systemd/system/usr-local.mount
lib/systemd/user-environment-generators/30-qubes.sh
usr/lib/sysctl.d/20-qubes-core.conf
usr/lib/systemd/user/tracker-extract-3.service.d/30_qubes.conf
usr/lib/systemd/user/tracker-miner-fs-3.service.d/30_qubes.conf
Expand Down
1 change: 1 addition & 0 deletions rpm_spec/core-agent.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -1255,6 +1255,7 @@ The Qubes core startup configuration for SystemD init.
%_userunitdir/gvfs-daemon.service.d/30_qubes.conf
%_userunitdir/pipewire.service.d/40_minimal.conf
%_userunitdir/wireplumber.service.d/30_qubes.conf
/usr/lib/systemd/user-environment-generators/30-qubes.sh

%post systemd

Expand Down
6 changes: 6 additions & 0 deletions vm-systemd/user-environment-generators/30-qubes.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/sh

# Disable GVFS usage for GIO clients
if [ -f /run/qubes-service/minimal-netvm ] || [ -f /run/qubes-service/minimal-usbvm ]; then
echo "GIO_USE_VFS=local"
fi