|
 |
f065e8 |
From 26de0ad2f0f975166fe79ef72ab08e2c03519eea Mon Sep 17 00:00:00 2001
|
|
|
f065e8 |
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
|
|
f065e8 |
Date: Mon, 28 Mar 2022 13:25:35 +0200
|
|
|
f065e8 |
Subject: [PATCH] Filesystem: fix logic for UUID/label devices with space
|
|
|
f065e8 |
between parameter and UUID/label
|
|
|
f065e8 |
|
|
|
f065e8 |
---
|
|
|
f065e8 |
heartbeat/Filesystem | 14 ++++++++++----
|
|
|
f065e8 |
1 file changed, 10 insertions(+), 4 deletions(-)
|
|
|
f065e8 |
|
|
|
f065e8 |
diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem
|
|
|
f065e8 |
index 1a90d6a42..72a1b8623 100755
|
|
|
f065e8 |
--- a/heartbeat/Filesystem
|
|
|
f065e8 |
+++ b/heartbeat/Filesystem
|
|
|
f065e8 |
@@ -596,11 +596,11 @@ Filesystem_start()
|
|
|
f065e8 |
flushbufs "$DEVICE"
|
|
|
f065e8 |
# Mount the filesystem.
|
|
|
f065e8 |
case "$FSTYPE" in
|
|
|
f065e8 |
- none) $MOUNT $options "$DEVICE" "$MOUNTPOINT" &&
|
|
|
f065e8 |
+ none) $MOUNT $options $device_opt "$DEVICE" "$MOUNTPOINT" &&
|
|
|
f065e8 |
bind_mount
|
|
|
f065e8 |
;;
|
|
|
f065e8 |
- "") $MOUNT $options "$DEVICE" "$MOUNTPOINT" ;;
|
|
|
f065e8 |
- *) $MOUNT -t "$FSTYPE" $options "$DEVICE" "$MOUNTPOINT" ;;
|
|
|
f065e8 |
+ "") $MOUNT $options $device_opt "$DEVICE" "$MOUNTPOINT" ;;
|
|
|
f065e8 |
+ *) $MOUNT -t "$FSTYPE" $options $device_opt "$DEVICE" "$MOUNTPOINT" ;;
|
|
|
f065e8 |
esac
|
|
|
f065e8 |
|
|
|
f065e8 |
if [ $? -ne 0 ]; then
|
|
|
f065e8 |
@@ -902,7 +902,13 @@ set_blockdevice_var() {
|
|
|
f065e8 |
fi
|
|
|
f065e8 |
|
|
|
f065e8 |
case "$DEVICE" in
|
|
|
f065e8 |
- -*) # Oh... An option to mount instead... Typically -U or -L
|
|
|
f065e8 |
+ --*) # Typically --uuid or --label
|
|
|
f065e8 |
+ device_opt=$(echo $DEVICE | sed -E "s/([[:blank:]]|=).*//")
|
|
|
f065e8 |
+ DEVICE=$(echo $DEVICE | sed -E "s/$device_opt([[:blank:]]*|=)//")
|
|
|
f065e8 |
+ ;;
|
|
|
f065e8 |
+ -*) # Oh... An option to mount instead... Typically -U or -L
|
|
|
f065e8 |
+ device_opt=$(echo $DEVICE | cut -c1-2)
|
|
|
f065e8 |
+ DEVICE=$(echo $DEVICE | sed "s/$device_opt[[:blank:]]*//")
|
|
|
f065e8 |
;;
|
|
|
f065e8 |
/dev/null) # Special case for BSC
|
|
|
f065e8 |
blockdevice=yes
|