openstack/deb-python-diskimage-builder
Code Issues Proposed changes

Merge "Use --numeric-owner when extracting base image"

Browse Source
This commit is contained in:
Jenkins
2013-10-08 22:54:08 +00:00
committed by Gerrit Code Review
parent 9efc02682b 6da49c6d49
commit 126099cd6d
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
elements/fedora/root.d/10-fedora-cloud-image
View File

@@ -58,6 +58,7 @@ else
mv $WORKING/tmp.tar $DIB_IMAGE_CACHE/$BASE_IMAGE_TAR mv $WORKING/tmp.tar $DIB_IMAGE_CACHE/$BASE_IMAGE_TAR
fi fi
fi fi
# Extract the base image # Extract the base image (use --numeric-owner to avoid UID/GID mismatch between
sudo tar -C $TARGET_ROOT -xzf $DIB_IMAGE_CACHE/$BASE_IMAGE_TAR # image tarball and host OS e.g. when building Fedora image on an openSUSE host)
sudo tar -C $TARGET_ROOT --numeric-owner -xzf $DIB_IMAGE_CACHE/$BASE_IMAGE_TAR
sudo rmdir $TARGET_ROOT/lost+found sudo rmdir $TARGET_ROOT/lost+found

5
elements/rhel/root.d/10-rhel-cloud-image
View File

@@ -51,6 +51,7 @@ else
mv $WORKING/tmp.tar $DIB_IMAGE_CACHE/$BASE_IMAGE_TAR mv $WORKING/tmp.tar $DIB_IMAGE_CACHE/$BASE_IMAGE_TAR
fi fi
fi fi
# Extract the base image # Extract the base image (use --numeric-owner to avoid UID/GID mismatch between
sudo tar -C $TARGET_ROOT -xzf $DIB_IMAGE_CACHE/$BASE_IMAGE_TAR # image tarball and host OS e.g. when building RHEL image on an openSUSE host)
sudo tar -C $TARGET_ROOT --numeric-owner -xzf $DIB_IMAGE_CACHE/$BASE_IMAGE_TAR
sudo rmdir $TARGET_ROOT/lost+found sudo rmdir $TARGET_ROOT/lost+found

5
elements/ubuntu/root.d/10-cache-ubuntu-tarball
View File

@@ -24,6 +24,7 @@ else
grep "$BASE_IMAGE_FILE" SHA256SUMS.ubuntu.$DIB_RELEASE.$ARCH | sha256sum --check - grep "$BASE_IMAGE_FILE" SHA256SUMS.ubuntu.$DIB_RELEASE.$ARCH | sha256sum --check -
popd popd
fi fi
# Extract the base image # Extract the base image (use --numeric-owner to avoid UID/GID mismatch between
sudo tar -C $TARGET_ROOT -xzf $DIB_IMAGE_CACHE/$BASE_IMAGE_FILE # image tarball and host OS e.g. when building Ubuntu image on an openSUSE host)
sudo tar -C $TARGET_ROOT --numeric-owner -xzf $DIB_IMAGE_CACHE/$BASE_IMAGE_FILE
sudo rmdir $TARGET_ROOT/lost+found sudo rmdir $TARGET_ROOT/lost+found