commit: 99fc43024db4be08fbfbff3a6a79c90db920e927
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 1 19:40:15 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 1 19:40:15 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=99fc4302
drop --selinux switch from tar
tar --selinux isn't support unless you are on selinux, and in that case
things are still not likely to be right do to the dark magic that is selinux.
>From the head of the selinux team:
<@SwifT> Zero_Chaos: let's not use tar --selinux right now until we have
updated catalyst to create selinux-enabled chroots
catalyst/base/stagebase.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 6adc3b9..25e5b6c 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -696,10 +696,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.settings["chroot_path"]+\
" (This may take some time)
...\n"
if "bz2" == self.settings["chroot_path"][-3:]:
- unpack_cmd="tar --xattrs
--xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux
-I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+ unpack_cmd="tar --xattrs
--xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2
-xpf "+self.settings["source_path"]+" -C "+\
self.settings["chroot_path"]
else:
- unpack_cmd="tar --xattrs
--xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux
-I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+ unpack_cmd="tar --xattrs
--xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2
-xpf "+self.settings["source_path"]+" -C "+\
self.settings["chroot_path"]
error_msg="Tarball extraction of "+\
self.settings["source_path"]+" to "+\
@@ -711,10 +711,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.settings["chroot_path"]+\
" (This may take some time) ...\n"
if "bz2" == self.settings["chroot_path"][-3:]:
- unpack_cmd="tar --xattrs
--xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux
-I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+ unpack_cmd="tar --xattrs
--xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2
-xpf "+self.settings["source_path"]+" -C "+\
self.settings["chroot_path"]
else:
- unpack_cmd="tar --xattrs
--xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux
-I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+ unpack_cmd="tar --xattrs
--xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2
-xpf "+self.settings["source_path"]+" -C "+\
self.settings["chroot_path"]
error_msg="Tarball extraction of
"+self.settings["source_path"]+\
" to "+self.settings["chroot_path"]+" failed."
@@ -806,9 +806,9 @@ class StageBase(TargetBase, ClearBase, GenBase):
"catalyst-hash")
destdir=self.settings["snapshot_cache_path"]
if "bz2" == self.settings["chroot_path"][-3:]:
- unpack_cmd="tar --xattrs
--xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux
-I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir
+ unpack_cmd="tar --xattrs
--xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2
-xpf "+self.settings["snapshot_path"]+" -C "+destdir
else:
- unpack_cmd="tar --xattrs
--xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux
-xpf "+self.settings["snapshot_path"]+" -C "+destdir
+ unpack_cmd="tar --xattrs
--xattrs-include=security.capability --xattrs-include=user.pax.flags -xpf
"+self.settings["snapshot_path"]+" -C "+destdir
unpack_errmsg="Error unpacking snapshot"
cleanup_msg="Cleaning up invalid snapshot cache at
\n\t"+\
self.settings["snapshot_cache_path"]+\
@@ -825,10 +825,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
cleanup_msg=\
"Cleaning up existing portage tree (This can
take a long time)..."
if "bz2" == self.settings["chroot_path"][-3:]:
- unpack_cmd="tar --xattrs
--xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux
-I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\
+ unpack_cmd="tar --xattrs
--xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2
-xpf "+self.settings["snapshot_path"]+" -C "+\
self.settings["chroot_path"]+"/usr"
else:
- unpack_cmd="tar --xattrs
--xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux
-xpf "+self.settings["snapshot_path"]+" -C "+\
+ unpack_cmd="tar --xattrs
--xattrs-include=security.capability --xattrs-include=user.pax.flags -xpf
"+self.settings["snapshot_path"]+" -C "+\
self.settings["chroot_path"]+"/usr"
unpack_errmsg="Error unpacking snapshot"
@@ -1256,7 +1256,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
print "Creating stage tarball..."
- cmd("tar --xattrs --xattrs-include=security.capability
--xattrs-include=user.pax.flags --selinux -I lbzip2 -cpf
"+self.settings["target_path"]+" -C "+\
+ cmd("tar --xattrs --xattrs-include=security.capability
--xattrs-include=user.pax.flags -I lbzip2 -cpf "+self.settings["target_path"]+"
-C "+\
self.settings["stage_path"]+" .",\
"Couldn't create stage tarball",env=self.env)
