support/shell-container.c: Use support_copy_file_range

Reviewed-by: DJ Delorie <dj@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index da72d308c8a98a932b8dcaaf48f0d2ced42986d8..497f5b721c874cabd09f86869840ef9fdfda6cd1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-11-02  Florian Weimer  <fweimer@redhat.com>
+
+       * support/shell-container.c (copy_func): Call
+       support_copy_file_range instead of copy_file_range to support
+       cross-device copies.
+
 2018-11-02  Florian Weimer  <fweimer@redhat.com>
 
        * support/test-container.c: Include <libc-pointer-arith.h> for

diff --git a/support/shell-container.c b/support/shell-container.c
index d303131dafc2aafa534bda2a4ed7e20d7e46bd26..9bd90d3f605290791d6f6e5b976f714c9cd4fdbc 100644 (file)
--- a/support/shell-container.c
+++ b/support/shell-container.c
@@ -119,7 +119,7 @@ copy_func (char **argv)
       return 1;
     }
 
-  if (copy_file_range (sfd, 0, dfd, 0, st.st_size, 0) != st.st_size)
+  if (support_copy_file_range (sfd, 0, dfd, 0, st.st_size, 0) != st.st_size)
     {
       fprintf (stderr, "cp: cannot copy file %s to %s: %s\n",
               sname, dname, strerror (errno));