Skip to content

Commit 9da2671

Browse files
committed
fix: correctly select root disk partition
1 parent 074a2ec commit 9da2671

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

ansible/files/admin_api_scripts/grow_fs.sh

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,27 @@ if pgrep resizefs; then
99
exit 1
1010
fi
1111

12+
# Parses the output of lsblk to get the root partition number
13+
# Example output:
14+
# NAME MOUNTPOINT
15+
# nvme0n1
16+
# ├─nvme0n1p1 /boot
17+
# └─nvme0n1p3 /
18+
# nvme1n1 /data
19+
#
20+
# Resulting in:
21+
# └─nvme0n1p3 / -> nvme0n1p3 -> 3
22+
ROOT_PARTITION_NUMBER=$(lsblk -no NAME,MOUNTPOINT | grep ' /$' | awk '{print $1;}' | sed 's/.*nvme[0-9]n[0-9]p//g')
23+
1224
if [ -b /dev/nvme1n1 ] ; then
1325
if [[ "${VOLUME_TYPE}" == "data" ]]; then
1426
resize2fs /dev/nvme1n1
1527

1628
elif [[ "${VOLUME_TYPE}" == "root" ]] ; then
1729
PLACEHOLDER_FL=/home/ubuntu/50M_PLACEHOLDER
1830
rm -f "${PLACEHOLDER_FL}" || true
19-
growpart /dev/nvme0n1 2
20-
resize2fs /dev/nvme0n1p2
31+
growpart /dev/nvme0n1 "${ROOT_PARTITION_NUMBER}"
32+
resize2fs "/dev/nvme0n1p${ROOT_PARTITION_NUMBER}"
2133
if [[ ! -f "${PLACEHOLDER_FL}" ]] ; then
2234
fallocate -l50M "${PLACEHOLDER_FL}"
2335
fi
@@ -26,7 +38,7 @@ if [ -b /dev/nvme1n1 ] ; then
2638
exit 1
2739
fi
2840
else
29-
growpart /dev/nvme0n1 2
30-
resize2fs /dev/nvme0n1p2
41+
growpart /dev/nvme0n1 "${ROOT_PARTITION_NUMBER}"
42+
resize2fs "/dev/nvme0n1p${ROOT_PARTITION_NUMBER}"
3143
fi
3244
echo "Done resizing disk"

0 commit comments

Comments
 (0)