From: Mike Gilbert <floppymaster@gmail.com>
Date: Mon, 4 Apr 2016 11:08:26 +0000 (-0400)
Subject: import: Preserve xattrs in tar files
X-Git-Tag: v230~221
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2944758ccdeb0b86b39ebdcf753c364d8b2c2e18;p=thirdparty%2Fsystemd.git

import: Preserve xattrs in tar files

Resolves #2908
---

diff --git a/src/import/import-common.c b/src/import/import-common.c
index 18a30be36d8..287a3382a1c 100644
--- a/src/import/import-common.c
+++ b/src/import/import-common.c
@@ -136,7 +136,7 @@ int import_fork_tar_x(const char *path, pid_t *ret) {
                 if (r < 0)
                         log_error_errno(r, "Failed to drop capabilities, ignoring: %m");
 
-                execlp("tar", "tar", "--numeric-owner", "-C", path, "-px", NULL);
+                execlp("tar", "tar", "--numeric-owner", "-C", path, "-px", "--xattrs", "--xattrs-include=*", NULL);
                 log_error_errno(errno, "Failed to execute tar: %m");
                 _exit(EXIT_FAILURE);
         }
@@ -210,7 +210,7 @@ int import_fork_tar_c(const char *path, pid_t *ret) {
                 if (r < 0)
                         log_error_errno(r, "Failed to drop capabilities, ignoring: %m");
 
-                execlp("tar", "tar", "-C", path, "-c", ".", NULL);
+                execlp("tar", "tar", "-C", path, "-c", "--xattrs", "--xattrs-include=*", ".", NULL);
                 log_error_errno(errno, "Failed to execute tar: %m");
                 _exit(EXIT_FAILURE);
         }