Merge pull request rhinstaller#3138 from rvykydal/fix-tar-payload-ext…

…ract-excludes Fix exclude arguments of tar payload extracting.
rvykydal · Feb 4, 2021 · 7791820 · 7791820
2 parents 118776d + dfd387c
commit 7791820
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/pyanaconda/modules/payloads/payload/live_image/installation.py b/pyanaconda/modules/payloads/payload/live_image/installation.py
@@ -42,10 +42,10 @@ def run(self):
         cmd = "tar"
         # preserve: ACL's, xattrs, and SELinux context
         args = ["--numeric-owner", "--selinux", "--acls", "--xattrs", "--xattrs-include", "*",
-                "--exclude", "dev/*", "--exclude", "proc/*", "--exclude", "tmp/*",
-                "--exclude", "sys/*", "--exclude", "run/*", "--exclude", "boot/*rescue*",
-                "--exclude", "boot/loader", "--exclude", "boot/efi/loader",
-                "--exclude", "etc/machine-id", "-xaf", self._tarfile_path, "-C", self._dest_path]
+                "--exclude", "./dev/*", "--exclude", "./proc/*", "--exclude", "./tmp/*",
+                "--exclude", "./sys/*", "--exclude", "./run/*", "--exclude", "./boot/*rescue*",
+                "--exclude", "./boot/loader", "--exclude", "./boot/efi/loader",
+                "--exclude", "./etc/machine-id", "-xaf", self._tarfile_path, "-C", self._dest_path]
         try:
             rc = execWithRedirect(cmd, args)
         except (OSError, RuntimeError) as e:

diff --git a/pyanaconda/payload/live/payload_liveimg.py b/pyanaconda/payload/live/payload_liveimg.py
@@ -303,10 +303,10 @@ def install(self):
         cmd = "tar"
         # preserve: ACL's, xattrs, and SELinux context
         args = ["--numeric-owner", "--selinux", "--acls", "--xattrs", "--xattrs-include", "*",
-                "--exclude", "dev/*", "--exclude", "proc/*", "--exclude", "tmp/*",
-                "--exclude", "sys/*", "--exclude", "run/*", "--exclude", "boot/*rescue*",
-                "--exclude", "boot/loader", "--exclude", "boot/efi/loader",
-                "--exclude", "etc/machine-id", "-xaf", self.image_path, "-C", conf.target.system_root]
+                "--exclude", "./dev/*", "--exclude", "./proc/*", "--exclude", "./tmp/*",
+                "--exclude", "./sys/*", "--exclude", "./run/*", "--exclude", "./boot/*rescue*",
+                "--exclude", "./boot/loader", "--exclude", "./boot/efi/loader",
+                "--exclude", "./etc/machine-id", "-xaf", self.image_path, "-C", conf.target.system_root]
         try:
             rc = util.execWithRedirect(cmd, args)
         except (OSError, RuntimeError) as e: