Skip to content

Commit c5a3980

Browse files
committed
fix: use findmnt to more robustly discover mount point
1 parent 236e92c commit c5a3980

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

ansible/files/admin_api_scripts/grow_fs.sh

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ fi
2121
# We currently mount 3 possible disks
2222
# - /dev/xvda (root disk)
2323
# - /dev/xvdh (data disk)
24-
# - /dev/xvdp (upgrade data disk)
24+
# - /dev/xvdp (upgrade data disk), not used here
2525
# Initialize variables at 20.04 levels
2626
XVDA_DEVICE="/dev/nvme0n1"
2727
XVDH_DEVICE="/dev/nvme1n1"
@@ -40,17 +40,10 @@ fi
4040

4141
echo "Using devices - Root: $XVDA_DEVICE, Data: $XVDH_DEVICE"
4242

43-
# Parses the output of lsblk to get the root partition number
44-
# Example output:
45-
# NAME MOUNTPOINT
46-
# nvme0n1
47-
# ├─nvme0n1p1 /boot
48-
# └─nvme0n1p3 /
49-
# nvme1n1 /data
50-
#
51-
# Resulting in:
52-
# └─nvme0n1p3 / -> nvme0n1p3 -> 3
53-
ROOT_PARTITION_NUMBER=$(lsblk -no NAME,MOUNTPOINT | grep ' /$' | awk '{print $1;}' | sed 's/.*nvme[0-9]n[0-9]p//g')
43+
# Get root partition using findmnt
44+
ROOT_DEVICE_FULL=$(findmnt -no SOURCE /)
45+
ROOT_DEVICE=$(lsblk -no PKNAME "$ROOT_DEVICE_FULL")
46+
ROOT_PARTITION_NUMBER=$(echo "$ROOT_DEVICE_FULL" | sed "s|.*${ROOT_DEVICE}p||")
5447

5548
if ! [[ "$ROOT_PARTITION_NUMBER" =~ ^[0-9]+$ ]]; then
5649
echo "Error: ROOT_PARTITION_NUMBER is not a valid number: $ROOT_PARTITION_NUMBER"

0 commit comments

Comments
 (0)