From d277205c130d867cf8f70d40b256a23be64095aa Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 19 Jan 2017 13:21:14 -0500 Subject: [PATCH] tests: Actually install the new binaries I think since I landed a change to `--enable-new-name`, `/usr/bin/rpm-ostree` became a symlink, and without the `-l` switch, rsync skips over them. Hence, we have only been testing in vmcheck the old binaries, not new ones. Oops. Closes: #585 Approved by: jlebon --- tests/vmcheck/overlay.sh | 2 +- tests/vmcheck/sync.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/vmcheck/overlay.sh b/tests/vmcheck/overlay.sh index 3f4fe265..8447645e 100755 --- a/tests/vmcheck/overlay.sh +++ b/tests/vmcheck/overlay.sh @@ -51,7 +51,7 @@ fi cd /ostree/repo/tmp rm vmcheck -rf ostree checkout $commit vmcheck --fsync=0 -rsync -rv /var/roothome/sync/insttree/usr/ vmcheck/usr/ +rsync -rlv /var/roothome/sync/insttree/usr/ vmcheck/usr/ ostree refs --delete vmcheck || true ostree commit -b vmcheck -s '' --tree=dir=vmcheck --link-checkout-speedup ostree admin deploy vmcheck diff --git a/tests/vmcheck/sync.sh b/tests/vmcheck/sync.sh index f063c1cd..046adf2a 100755 --- a/tests/vmcheck/sync.sh +++ b/tests/vmcheck/sync.sh @@ -26,7 +26,7 @@ else # then do this in the VM set -x ostree admin unlock || : - rsync -rv /var/roothome/sync/insttree/usr/ /usr/ + rsync -rlv /var/roothome/sync/insttree/usr/ /usr/ restorecon /usr/libexec/rpm-ostreed systemctl restart rpm-ostreed fi