From 53c41b45c4b22466a25ec5629cb799e3c6387a12 Mon Sep 17 00:00:00 2001 From: mossy-nw <34462023+mossy-nw@users.noreply.github.com> Date: Tue, 16 Jan 2018 23:43:17 +0000 Subject: [PATCH 1/3] Update copying-files.md adding command line notes indicating qvm-copy-to-vm/qvm-move-to-vm tools deprecated. --- common-tasks/copying-files.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common-tasks/copying-files.md b/common-tasks/copying-files.md index 392310a6..61c4e668 100644 --- a/common-tasks/copying-files.md +++ b/common-tasks/copying-files.md @@ -32,8 +32,13 @@ GUI CLI --- +qvm-copy [--without-progress] dest_vmname file [file]+ + [qvm-copy-to-vm](/doc/vm-tools/qvm-copy-to-vm/) +note: qvm-copy-to-vm/qvm-move-to-vm tools are deprecated, use qvm-copy/qvm-move to avoid typing target qube name twice + + On inter-qube file copy security ---------------------------------- From d8018e10e06e475cbc3cf496c5871b41f51f3fea Mon Sep 17 00:00:00 2001 From: mossy-nw <34462023+mossy-nw@users.noreply.github.com> Date: Thu, 18 Jan 2018 23:53:10 +0000 Subject: [PATCH 2/3] Update copying-files.md moved R4.0 info to Qubes 4.0 section --- common-tasks/copying-files.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/common-tasks/copying-files.md b/common-tasks/copying-files.md index 61c4e668..b92970bd 100644 --- a/common-tasks/copying-files.md +++ b/common-tasks/copying-files.md @@ -32,11 +32,17 @@ GUI CLI --- -qvm-copy [--without-progress] dest_vmname file [file]+ +qvm-copy-to-vm [--without-progress] dest_vmname file [file]+ [qvm-copy-to-vm](/doc/vm-tools/qvm-copy-to-vm/) -note: qvm-copy-to-vm/qvm-move-to-vm tools are deprecated, use qvm-copy/qvm-move to avoid typing target qube name twice + +Qubes 4.0 +--------- + +In Qubes 4.0, qvm-copy-to-vm and qvm-move-to-vm are deprecated (GUI behaviour is unchanged from Qubes 3.2). In the command line, use qvm-copy or qvm-move to avoid typing target qube name twice. + +qvm-copy [--without-progress] file [file]+ On inter-qube file copy security From 6552610775cde033faf34fe76982b15815100659 Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Thu, 18 Jan 2018 20:19:21 -0600 Subject: [PATCH 3/3] Improve formatting --- common-tasks/copying-files.md | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/common-tasks/copying-files.md b/common-tasks/copying-files.md index b92970bd..a5b8af28 100644 --- a/common-tasks/copying-files.md +++ b/common-tasks/copying-files.md @@ -19,22 +19,25 @@ In order to copy file(s) from qube A to qube B, follow these steps: GUI --- -1. Open file manager in the source qube (qube A), choose file(s) that you wish to copy, and right click on the selection, and choose `Copy to another AppVM` +1. Open file manager in the source qube (qube A), choose file(s) that you wish to copy, and right click on the selection, and choose `Copy to another AppVM` -1. A dialog box will appear asking for the name of the destination qube (qube B). +2. A dialog box will appear asking for the name of the destination qube (qube B). -1. A confirmation dialog box will appear(this will be displayed by Dom0, so none of the qubes can fake your consent). After you click ok, qube B will be started if it is not already running, the file copy operation will start, and the files will be copied into the following folder in qube B: +3. A confirmation dialog box will appear(this will be displayed by Dom0, so none of the qubes can fake your consent). After you click ok, qube B will be started if it is not already running, the file copy operation will start, and the files will be copied into the following folder in qube B: -- `/home/user/QubesIncoming/` + `/home/user/QubesIncoming/` + +4. You can now move them whenever you like in the qube B filesystem using the file manager there. -1. You can now move them whenever you like in the qube B filesystem using the file manager there. CLI --- +``` qvm-copy-to-vm [--without-progress] dest_vmname file [file]+ +``` -[qvm-copy-to-vm](/doc/vm-tools/qvm-copy-to-vm/) +Also see: [qvm-copy-to-vm](/doc/vm-tools/qvm-copy-to-vm/) Qubes 4.0 @@ -42,7 +45,9 @@ Qubes 4.0 In Qubes 4.0, qvm-copy-to-vm and qvm-move-to-vm are deprecated (GUI behaviour is unchanged from Qubes 3.2). In the command line, use qvm-copy or qvm-move to avoid typing target qube name twice. +``` qvm-copy [--without-progress] file [file]+ +``` On inter-qube file copy security @@ -55,3 +60,4 @@ However, one should keep in mind that performing a data transfer from *less trus See also [this article](https://blog.invisiblethings.org/2011/03/13/partitioning-my-digital-life-into.html) for more information on this topic, and some ideas of how we might solve this problem in some future version of Qubes. You may also want to read how to [revoke "Yes to All" authorization](/doc/qrexec3/#revoking-yes-to-all-authorization) +