Browse Source

Rename qvm-run to qvm-run-vm

Avoid conflict with qvm-run from qubes-core-admin-client package.
Marek Marczykowski-Górecki 7 years ago
parent
commit
f9d6ff89bc
5 changed files with 8 additions and 8 deletions
  1. 1 1
      Makefile
  2. 1 1
      debian/qubes-core-agent.install
  3. 5 5
      doc/vm-tools/qvm-run-vm.rst
  4. 0 0
      qubes-rpc/qvm-run-vm
  5. 1 1
      rpm_spec/core-vm.spec

+ 1 - 1
Makefile

@@ -235,7 +235,7 @@ install-common:
 	install -d $(DESTDIR)$(BINDIR)
 	install -m 0755 misc/qubes-session-autostart $(DESTDIR)$(BINDIR)/qubes-session-autostart
 	install -m 0755 misc/qvm-features-request $(DESTDIR)$(BINDIR)/qvm-features-request
-	install qubes-rpc/{qvm-open-in-dvm,qvm-open-in-vm,qvm-copy-to-vm,qvm-run} $(DESTDIR)/usr/bin
+	install qubes-rpc/{qvm-open-in-dvm,qvm-open-in-vm,qvm-copy-to-vm,qvm-run-vm} $(DESTDIR)/usr/bin
 	ln -s qvm-copy-to-vm $(DESTDIR)/usr/bin/qvm-move-to-vm
 	install qubes-rpc/qvm-copy-to-vm.kde $(DESTDIR)$(LIBDIR)/qubes
 	install qubes-rpc/qvm-copy-to-vm.gnome $(DESTDIR)$(LIBDIR)/qubes

+ 1 - 1
debian/qubes-core-agent.install

@@ -98,7 +98,7 @@ usr/bin/qvm-features-request
 usr/bin/qvm-move-to-vm
 usr/bin/qvm-open-in-dvm
 usr/bin/qvm-open-in-vm
-usr/bin/qvm-run
+usr/bin/qvm-run-vm
 usr/bin/xenstore-watch-qubes
 usr/lib/NetworkManager/conf.d/30-qubes.conf
 usr/lib/python2.7/dist-packages/qubesxdg.py

+ 5 - 5
doc/vm-tools/qvm-run.rst → doc/vm-tools/qvm-run-vm.rst

@@ -1,14 +1,14 @@
-=======
-qvm-run
-=======
+==========
+qvm-run-vm
+==========
 
 NAME
 ====
-qvm-run - run a specified command in a specified VM
+qvm-run-vm - run a specified command in a specified VM
 
 SYNOPSIS
 ========
-| qvm-run vmname command [aguments]
+| qvm-run-vm vmname command [aguments]
 
 OPTIONS
 =======

+ 0 - 0
qubes-rpc/qvm-run → qubes-rpc/qvm-run-vm


+ 1 - 1
rpm_spec/core-vm.spec

@@ -473,7 +473,7 @@ rm -f %{name}-%{version}
 /usr/bin/qvm-move-to-vm
 /usr/bin/qvm-open-in-dvm
 /usr/bin/qvm-open-in-vm
-/usr/bin/qvm-run
+/usr/bin/qvm-run-vm
 /usr/bin/qvm-features-request
 /usr/bin/xenstore-watch-qubes
 /usr/bin/qubes-desktop-run