openstack/diskimage-builder
Code Issues Proposed changes

Remove nested quotes from TAROPTS

Browse Source 
Per the bug report, these seem to be causing issues with maintaining
file capabilities.  They aren't necessary so let's just remove them.

Change-Id: I06c90fdc85655986142b936cadbe04d75dd27427
Closes-Bug: 1714604
This commit is contained in:
Ben Nemec 2017-09-01 17:29:15 -05:00
parent 39d84d2059
commit 72d0d22cdf
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diskimage_builder/elements/redhat-common/bin/extract-image
View File

@ -96,7 +96,7 @@ function extract_image() {
if [ 0 == `sudo chroot $WORKING/mnt bin/tar --help | grep -c xattrs-exclude` ]; then if [ 0 == `sudo chroot $WORKING/mnt bin/tar --help | grep -c xattrs-exclude` ]; then
TAROPTS="--no-xattrs" TAROPTS="--no-xattrs"
else else
TAROPTS="--xattrs --xattrs-include='*' --xattrs-exclude='security.selinux'" TAROPTS="--xattrs --xattrs-include=* --xattrs-exclude=security.selinux"
fi fi
# Chroot in so that we get the correct uid/gid # Chroot in so that we get the correct uid/gid
sudo chroot $WORKING/mnt bin/tar $TAROPTS -cz . > $WORKING/tmp.tar sudo chroot $WORKING/mnt bin/tar $TAROPTS -cz . > $WORKING/tmp.tar