Merge remote-tracking branch 'qubesos/pr/22'

* qubesos/pr/22:
  Move qvm-xkill to different repo/pkg
pull/17/merge
Marek Marczykowski-Górecki 7 years ago
commit b69f263c10
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724

@ -142,7 +142,6 @@ install -m 644 -D system-config/75-qubes-dom0.preset \
$RPM_BUILD_ROOT/usr/lib/systemd/system-preset/75-qubes-dom0.preset
install -m 644 -D system-config/99-qubes-default-disable.preset \
$RPM_BUILD_ROOT/usr/lib/systemd/system-preset/99-qubes-default-disable.preset
install -m 755 tools/qvm-xkill $RPM_BUILD_ROOT/usr/bin/
# file copy to VM
install -m 755 file-copy-vm/qfile-dom0-agent $RPM_BUILD_ROOT/usr/lib/qubes/
@ -226,7 +225,6 @@ chmod -x /etc/grub.d/10_linux
%config(noreplace) /etc/profile.d/zz-disable-lesspipe.sh
/usr/lib/systemd/system-preset/75-qubes-dom0.preset
/usr/lib/systemd/system-preset/99-qubes-default-disable.preset
/usr/bin/qvm-xkill
# Man
%{_mandir}/man1/qvm-*.1*
%{_mandir}/man1/qubes-*.1*

@ -1,10 +0,0 @@
#!/bin/sh
set -e
ID=$(xdotool selectwindow)
xprop -id "$ID" _QUBES_VMNAME | grep -q ' = ' \
|| { echo "${0##*/}: Not killing dom0 window $ID" >&2; exit 1; }
xdotool windowkill "$ID"
Loading…
Cancel
Save