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
46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
From 445d0a70896485991ba8ccc763422eefcda1ba1e Mon Sep 17 00:00:00 2001
|
|
From: Thomas Renninger <trenn@suse.de>
|
|
Date: Mon, 25 Aug 2014 18:04:05 +0200
|
|
Subject: dracut.sh: Fix LABEL= and other fstab syntax
|
|
|
|
On my test system I had problem with -o device in combination with -l option,
|
|
but this must have been a blkid, or sysfs issue.
|
|
Patch should be correct.
|
|
|
|
Signed-off-by: Thomas Renninger <trenn@suse.de>
|
|
---
|
|
dracut.sh | 11 ++++-------
|
|
1 files changed, 4 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/dracut.sh b/dracut.sh
|
|
index d087530..2baacfd 100755
|
|
--- a/dracut.sh
|
|
+++ b/dracut.sh
|
|
@@ -1024,19 +1024,16 @@ for line in "${fstab_lines[@]}"; do
|
|
#dev mp fs fsopts
|
|
case "$dev" in
|
|
UUID=*)
|
|
- dev=/dev/disk/by-uuid/${dev#UUID=*}
|
|
+ dev=$(blkid -l -t PARTLABEL="$dev" -o device)
|
|
;;
|
|
LABEL=*)
|
|
- dwarn "Not supported fstab line: $@"
|
|
+ dev=$(blkid -l -t LABEL="$dev" -o device)
|
|
;;
|
|
PARTUUID=*)
|
|
- dwarn "Not supported fstab line: $@"
|
|
+ dev=$(blkid -l -t PARTUUID="$dev" -o device)
|
|
;;
|
|
PARTLABEL=*)
|
|
- dwarn "Not supported fstab line: $@"
|
|
- ;;
|
|
- *)
|
|
- dwarn "Not supported fstab line: $@"
|
|
+ dev=$(blkid -l -t PARTLABEL="$dev" -o device)
|
|
;;
|
|
esac
|
|
push_host_devs "$dev"
|
|
--
|
|
1.7.6.1
|
|
|