openstack/diskimage-builder
Code Issues Proposed changes

Merge "Fall back to extract-image on ubuntu build"

Browse Source
This commit is contained in:
Zuul 2024-11-21 01:01:17 +00:00 committed by Gerrit Code Review
commit 0f217d2439
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,8 @@ function get_ubuntu_tarball() {
exit 1 exit 1
fi fi
IMAGE_PATH=$DIB_LOCAL_IMAGE IMAGE_PATH=$DIB_LOCAL_IMAGE
BASE_IMAGE_FILE=$(basename $DIB_LOCAL_IMAGE)
CACHED_FILE=$IMAGE_PATH
else else
if [ -n "$DIB_OFFLINE" -a -f "$CACHED_FILE" ] ; then if [ -n "$DIB_OFFLINE" -a -f "$CACHED_FILE" ] ; then
echo "Not checking freshness of cached $CACHED_FILE." echo "Not checking freshness of cached $CACHED_FILE."
@ -52,7 +54,15 @@ function get_ubuntu_tarball() {
# Extract the base image (use --numeric-owner to avoid UID/GID mismatch between # Extract the base image (use --numeric-owner to avoid UID/GID mismatch between
# image tarball and host OS e.g. when building Ubuntu image on an openSUSE host) # image tarball and host OS e.g. when building Ubuntu image on an openSUSE host)
if [ "$DIB_RELEASE" != "trusty" ] ; then if [ "$DIB_RELEASE" != "trusty" ] ; then
sudo unsquashfs -f -d $TARGET_ROOT $IMAGE_PATH # If image is local, it may not be squashfs.
# Fall back to extract-image.
{
sudo unsquashfs -f -d $TARGET_ROOT $IMAGE_PATH
} ||
{
BASE_IMAGE_TAR=$BASE_IMAGE_FILE.tgz
$TMP_HOOKS_PATH/bin/extract-image $BASE_IMAGE_FILE $BASE_IMAGE_TAR $IMAGE_PATH $CACHED_FILE
}
else else
sudo tar -C $TARGET_ROOT --numeric-owner -xzf $IMAGE_PATH sudo tar -C $TARGET_ROOT --numeric-owner -xzf $IMAGE_PATH
fi fi