Skip to content

Fix qvm-copy behavior with symlinks #548

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

Merged
merged 4 commits into from
Jan 20, 2025
Merged

Fix qvm-copy behavior with symlinks #548

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70729aa
strip trailing slash from source directory
zaz Jan 16, 2025
8fb8e26
FIX --ignore-symlinks
zaz Jan 16, 2025
baa8c34
refactor
zaz Jan 16, 2025
397b8c1
FIX qvm-copy for multiple sources
zaz Jan 17, 2025
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
12 changes: 8 additions & 4 deletions qubes-rpc/qvm-copy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ while [ "$#" -gt 0 ]; do
case $1 in
(--without-progress) export PROGRESS_TYPE=none; shift;;
(--with-progress) export PROGRESS_TYPE=console; shift;;
(--ignore-symlinks) ignore_symlinks=true; shift;;
(--ignore-symlinks) ignore_symlinks="--ignore-symlinks"; shift;;
(--no-ignore-symlinks) unset ignore_symlinks; shift;;
(-h|--help) usage 0;;
(--) shift; break;;
Expand All @@ -93,8 +93,12 @@ else
VM="@default"
fi

# strip trailing slash from source directory
SOURCE=( "${@%/}" )

if FILECOPY_TOTAL_BYTES=$("$scriptdir/qubes/qubes-fs-tree-check" \
--allow-symlinks --allow-directories --machine -- "$@"); then
${ignore_symlinks} \
--allow-symlinks --allow-directories --machine -- "${SOURCE[@]}"); then
service=qubes.Filecopy
else
status=$?
Expand All @@ -104,8 +108,8 @@ fi
if [[ "$PROGRESS_TYPE" = 'console' ]]; then export FILECOPY_TOTAL_BYTES; fi

"$scriptdir/qubes/qrexec-client-vm" --filter-escape-chars-stderr -- "$VM" \
"$service" "$scriptdir/qubes/qfile-agent" ${ignore_symlinks+--ignore-symlinks} -- "$@"
"$service" "$scriptdir/qubes/qfile-agent" ${ignore_symlinks} -- "${SOURCE[@]}"

if [ "$OPERATION_TYPE" = "move" ] ; then
rm -rf -- "$@"
rm -rf -- "${SOURCE[@]}"
fi