openstack/diskimage-builder
Code Issues Proposed changes

Refactor growroot for debuggabilty

Browse Source 
This is a slight refactor I found useful when debugging.  The
udevadmin info query will be visbile in the output of "set -x" which
helps, and is the logs/journal.

We can also reduce some calls by keeping the value and just grepping
with a herefile.

This also does some error checking and bails out if it does not see
what it needs to continue.

Change-Id: I39c4d262f9c5ce53f6b83d95b1363a74834cf2c8
This commit is contained in:
Ian Wienand 2016-02-10 14:02:28 +11:00
parent 9cd35c36e4
commit 63182a02e4
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
elements/growroot/static/usr/local/sbin/growroot
View File

@ -6,10 +6,26 @@ set -o pipefail
root_dev=$(df -P / | tail -n 1 | awk '/.*/ { print $1 }') root_dev=$(df -P / | tail -n 1 | awk '/.*/ { print $1 }')
disk=$(find /sys/dev/block -name $(udevadm info --query=all --name $root_dev | grep ID_PART_ENTRY_DISK | cut -d= -f2)) if [ -z "${root_dev}" ]; then
disk="/dev/$(source ${disk}/uevent; echo $DEVNAME)" echo "*** Root device not found?"
exit 1
fi
part_no=$(udevadm info --query=all --name $root_dev | grep ID_PART_ENTRY_NUMBER | cut -d= -f2) udev_root=$(udevadm info --query=all --name $root_dev)
part=$(grep ID_PART_ENTRY_DISK <<< "${udev_root}" | cut -d= -f2)
if [ -z "${part}" ]; then
echo "*** Root partition not found!"
exit 1
fi
part_no=$(grep ID_PART_ENTRY_NUMBER <<< "${udev_root}" | cut -d= -f2)
if [ -z "${part_no}" ]; then
echo "*** Root partition number not found!"
exit 1
fi
disk=$(find /sys/dev/block -name ${part})
disk="/dev/$(source ${disk}/uevent; echo $DEVNAME)"
set +e set +e
growpart $disk $part_no growpart $disk $part_no