Thomas Renninger
eb37c150a3
- Do not blindly try to touch the logfile (bnc#893219) * Add 0146-dracut.sh-corrected-logfile-check.patch - Only fix UUID= fstab parsing * Add 0147-dracut.sh-Fix-UUID-fstab-parsing-in-case-mount-optio.patch - Also fix other parsing syntax in fstab like LABEL= * Add 0148-dracut.sh-Fix-LABEL-and-other-fstab-syntax.patch - Fix up some bugs from previous commit * Add 0149-dracut.sh-Fix-fstab-parsing-again.patch - bnc#893615 * Add 0150-Find-kernel-modules-in-extra-and-weak-updates-path-a.patch - pixz does need too much memory, go back to xz in a conservative way (bnc#893981) * Add 0151-Go-back-to-xz-again-pixz-may-use-too-much-memory-whi.patch - Add some default tools to initrd when debug module is included and already provided an commented example line how to easily enable it. No functional change by default. * Add 0152-Add-a-comment-to-easily-add-debug-modules-also-add-v.patch OBS-URL: https://build.opensuse.org/request/show/246856 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=182
44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
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
|
|
|