Merge ~raharper/curtin:fix/vmtest-early-rsync-error into curtin:master

Proposed by Ryan Harper
Status: Merged
Approved by: Ryan Harper
Approved revision: 276120a349aaf847b303e1e544359aece7068ef8
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~raharper/curtin:fix/vmtest-early-rsync-error
Merge into: curtin:master
Diff against target: 13 lines (+1/-1)
1 file modified
examples/tests/reuse-lvm-member-partition.yaml (+1/-1)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Chad Smith Approve
Review via email: mp+382705@code.launchpad.net

Commit message

vmtest: rsync don't cross filesystem boundaries when copying

In some scenarios /var/lib/lxcfs is mounted with kernel bits
and rsync complains; instead we now copy using the --one-file-system
flag which avoids crossing these boundaries.

LP: #1873909

To post a comment you must log in.
Revision history for this message
Chad Smith (chad.smith) wrote :

Looks like the right change to make for the failing test.
Can see how this goes w/ unittest vmtest run.

review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/examples/tests/reuse-lvm-member-partition.yaml b/examples/tests/reuse-lvm-member-partition.yaml
2index 8d025aa..d2f73ba 100644
3--- a/examples/tests/reuse-lvm-member-partition.yaml
4+++ b/examples/tests/reuse-lvm-member-partition.yaml
5@@ -34,7 +34,7 @@ bucket:
6 # populate the lv with data to ensure we allocate extents on both pv devs
7 mkfs.ext4 /dev/${VG}/${LV}
8 mount /dev/${VG}/${LV} /mnt
9- rsync -aqpP /var /mnt
10+ rsync -aqpP --one-file-system /var /mnt
11 umount /mnt
12 # simulate the first boot environment by turning off the vg, and wiping
13 # one physical volume

Subscribers

People subscribed via source and target branches