dracut/0149-dracut.sh-Fix-fstab-parsing-again.patch

44 lines
1.3 KiB
Diff
Raw Normal View History

From b444f676e0c3847a42e7cd360846c8b669b022c3 Mon Sep 17 00:00:00 2001
From: Thomas Renninger <trenn@suse.de>
Date: Tue, 26 Aug 2014 17:31:33 +0200
Subject: dracut.sh: Fix fstab parsing again...
Signed-off-by: Thomas Renninger <trenn@suse.de>
---
dracut.sh | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dracut.sh b/dracut.sh
index 2baacfd..3a0c64b 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -1024,20 +1024,20 @@ for line in "${fstab_lines[@]}"; do
#dev mp fs fsopts
case "$dev" in
UUID=*)
- dev=$(blkid -l -t PARTLABEL="$dev" -o device)
+ dev=$(blkid -l -t UUID=${dev#UUID=} -o device)
;;
LABEL=*)
- dev=$(blkid -l -t LABEL="$dev" -o device)
+ dev=$(blkid -l -t LABEL=${dev#LABEL=} -o device)
;;
PARTUUID=*)
- dev=$(blkid -l -t PARTUUID="$dev" -o device)
+ dev=$(blkid -l -t PARTUUID=${dev#PARTUUID=} -o device)
;;
PARTLABEL=*)
- dev=$(blkid -l -t PARTLABEL="$dev" -o device)
+ dev=$(blkid -l -t PARTLABEL=${dev#PARTLABEL=} -o device)
;;
esac
+ [ -z "$dev" ] && dwarn "Bad fstab entry $@" && continue
push_host_devs "$dev"
- echo "$dev" "$3"
host_fs_types["$dev"]="$3"
done
--
1.7.6.1