sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issue in extract image

Browse Source 
The problem lays with the 'extract-image' script as
it is using lsblk commands to extract image's partition
(find out root/efi/boot, lines:100-102) but the output
is empty inside a container.

lsblk gives empty output for FSTYPE, LABEL, GUID..
the fix is to use blkid.

Closes-Bug: 1974350
Change-Id: I3b460c6dd9caa519c55327c5bd4b7e4585a8bd22
This commit is contained in:
jgupta 2022-07-25 14:46:10 +02:00 committed by dasm
parent 4ff8721a66
commit f2e7cd1307
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 fi
for LOOPDEV in ${LOOPDEVS}; do for LOOPDEV in ${LOOPDEVS}; do
fstype=$(lsblk --all --nodeps --noheadings --output FSTYPE $LOOPDEV) fstype=$(sudo blkid -o value -s TYPE -p "${LOOPDEV}" 2>/dev/null)
label=$(lsblk --all --nodeps --noheadings --output LABEL $LOOPDEV) label=$(sudo blkid -o value -s LABEL -p "${LOOPDEV}" 2>/dev/null)
part_type=$(lsblk --all --nodeps --noheadings --output PARTTYPE $LOOPDEV) part_type=$(sudo blkid -o value -s PART_ENTRY_TYPE -p "${LOOPDEV}" 2>/dev/null)
if [ -z "${fstype}" ]; then if [ -z "${fstype}" ]; then
# Ignore block device with no filesystem type # Ignore block device with no filesystem type