| 1 |
commit: 99fc43024db4be08fbfbff3a6a79c90db920e927 |
| 2 |
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 1 19:40:15 2015 +0000 |
| 4 |
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 1 19:40:15 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=99fc4302 |
| 7 |
|
| 8 |
drop --selinux switch from tar |
| 9 |
|
| 10 |
tar --selinux isn't support unless you are on selinux, and in that case |
| 11 |
things are still not likely to be right do to the dark magic that is selinux. |
| 12 |
From the head of the selinux team: |
| 13 |
<@SwifT> Zero_Chaos: let's not use tar --selinux right now until we have updated catalyst to create selinux-enabled chroots |
| 14 |
|
| 15 |
catalyst/base/stagebase.py | 18 +++++++++--------- |
| 16 |
1 file changed, 9 insertions(+), 9 deletions(-) |
| 17 |
|
| 18 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
| 19 |
index 6adc3b9..25e5b6c 100644 |
| 20 |
--- a/catalyst/base/stagebase.py |
| 21 |
+++ b/catalyst/base/stagebase.py |
| 22 |
@@ -696,10 +696,10 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 23 |
self.settings["chroot_path"]+\ |
| 24 |
" (This may take some time) ...\n" |
| 25 |
if "bz2" == self.settings["chroot_path"][-3:]: |
| 26 |
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
| 27 |
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
| 28 |
self.settings["chroot_path"] |
| 29 |
else: |
| 30 |
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
| 31 |
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
| 32 |
self.settings["chroot_path"] |
| 33 |
error_msg="Tarball extraction of "+\ |
| 34 |
self.settings["source_path"]+" to "+\ |
| 35 |
@@ -711,10 +711,10 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 36 |
self.settings["chroot_path"]+\ |
| 37 |
" (This may take some time) ...\n" |
| 38 |
if "bz2" == self.settings["chroot_path"][-3:]: |
| 39 |
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
| 40 |
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
| 41 |
self.settings["chroot_path"] |
| 42 |
else: |
| 43 |
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
| 44 |
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
| 45 |
self.settings["chroot_path"] |
| 46 |
error_msg="Tarball extraction of "+self.settings["source_path"]+\ |
| 47 |
" to "+self.settings["chroot_path"]+" failed." |
| 48 |
@@ -806,9 +806,9 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 49 |
"catalyst-hash") |
| 50 |
destdir=self.settings["snapshot_cache_path"] |
| 51 |
if "bz2" == self.settings["chroot_path"][-3:]: |
| 52 |
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir |
| 53 |
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir |
| 54 |
else: |
| 55 |
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir |
| 56 |
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags -xpf "+self.settings["snapshot_path"]+" -C "+destdir |
| 57 |
unpack_errmsg="Error unpacking snapshot" |
| 58 |
cleanup_msg="Cleaning up invalid snapshot cache at \n\t"+\ |
| 59 |
self.settings["snapshot_cache_path"]+\ |
| 60 |
@@ -825,10 +825,10 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 61 |
cleanup_msg=\ |
| 62 |
"Cleaning up existing portage tree (This can take a long time)..." |
| 63 |
if "bz2" == self.settings["chroot_path"][-3:]: |
| 64 |
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\ |
| 65 |
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\ |
| 66 |
self.settings["chroot_path"]+"/usr" |
| 67 |
else: |
| 68 |
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\ |
| 69 |
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags -xpf "+self.settings["snapshot_path"]+" -C "+\ |
| 70 |
self.settings["chroot_path"]+"/usr" |
| 71 |
unpack_errmsg="Error unpacking snapshot" |
| 72 |
|
| 73 |
@@ -1256,7 +1256,7 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 74 |
|
| 75 |
print "Creating stage tarball..." |
| 76 |
|
| 77 |
- cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\ |
| 78 |
+ cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\ |
| 79 |
self.settings["stage_path"]+" .",\ |
| 80 |
"Couldn't create stage tarball",env=self.env) |
Archives