openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "Fix issue in extract image"

This commit is contained in:
Zuul 2022-12-16 03:43:14 +00:00 committed by Gerrit Code Review
parent 41aa936fa2 f2e7cd1307
commit b706802a1c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
diskimage_builder/elements/sysprep/bin/extract-image
View File

@ -97,9 +97,9 @@ function extract_image() {
fi
for LOOPDEV in ${LOOPDEVS}; do
fstype=$(lsblk --all --nodeps --noheadings --output FSTYPE $LOOPDEV)
label=$(lsblk --all --nodeps --noheadings --output LABEL $LOOPDEV)
part_type=$(lsblk --all --nodeps --noheadings --output PARTTYPE $LOOPDEV)
fstype=$(sudo blkid -o value -s TYPE -p "${LOOPDEV}" 2>/dev/null)
label=$(sudo blkid -o value -s LABEL -p "${LOOPDEV}" 2>/dev/null)
part_type=$(sudo blkid -o value -s PART_ENTRY_TYPE -p "${LOOPDEV}" 2>/dev/null)
if [ -z "${fstype}" ]; then
# Ignore block device with no filesystem type