Skip to content

KVM #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
fepitre wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

KVM #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9bd4af
kvm: Initial KVM configuration updates
nrgaway Aug 2, 2020
b493122
kvm: Added systemd dropin units
nrgaway Aug 21, 2020
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: 4 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ install-vm: all-vm
install -m 0644 -D qubes-rpc-config/README $(DESTDIR)/etc/qubes/rpc-config/README
# install -d $(DESTDIR)/etc/qubes-rpc -m 755
# install -t $(DESTDIR)/etc/qubes-rpc -m 755 qubes-rpc/*
#### KVM:
install -d $(DESTDIR)/lib/systemd/system/qubes-qrexec-agent.service.d -m 755
install -t $(DESTDIR)/lib/systemd/system/qubes-qrexec-agent.service.d -m 644 systemd/qubes-qrexec-agent.service.d/30_qubes-kvm.conf
########
.PHONY: install-vm

all: all-vm all-dom0
Expand Down
8 changes: 4 additions & 4 deletions debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Maintainer: unman <unman@thirdeyesecurity.org>
Build-Depends:
debhelper,
libpam0g-dev,
libvchan-xen-dev,
libvchan-xen-dev|libvchan-kvm-dev,
pkg-config,
dh-python,
lsb-release,
Expand All @@ -18,10 +18,10 @@ Homepage: https://www.qubes-os.org

Package: qubes-core-qrexec
Architecture: any
Depends:
libvchan-xen,
Depends:
libvchan-xen|libvchan-kvm-dev,
libqrexec-utils2 (= ${binary:Version}),
${shlibs:Depends},
${shlibs:Depends},
${misc:Depends}
Replaces: qubes-core-agent-qrexec (<< 4.1.0-1)
Breaks:
Expand Down
4 changes: 4 additions & 0 deletions rpm_spec/qubes-qrexec-vm.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@ fi
/usr/lib/qubes/qrexec-client-vm
/usr/lib/qubes/qrexec_client_vm
/lib/systemd/system/qubes-qrexec-agent.service
#### KVM:
%dir /lib/systemd/system/qubes-qrexec-agent.service.d
/lib/systemd/system/qubes-qrexec-agent.service.d/30_qubes-kvm.conf
########

%changelog
@CHANGELOG@
10 changes: 10 additions & 0 deletions systemd/qubes-qrexec-agent.service.d/30_qubes-kvm.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[Unit]
ConditionPathExists=/var/run/qubes-service/hypervisor-kvm
# No 'xendriverdomain.service' depend in KVM.
After=
After=kvmchand.service
Requires=kvmchand.service

[Service]
# Prevent loading 'xen_evtchn'
ExecStartPre=