From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Fri, 26 Aug 2022 12:10:38 +0000 (+0000)
Subject: feat(fs-lib): fsck_single can now handle PARTLABEL and PARTUUID
X-Git-Tag: 058~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d40617f720ce7d895be4f6297ac4342d4492c39a;p=thirdparty%2Fdracut.git

feat(fs-lib): fsck_single can now handle PARTLABEL and PARTUUID

As an additional benefit, gentoo container now passing test-01.
---

diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh
index e05fa0c50..dd20731f2 100755
--- a/modules.d/99fs-lib/fs-lib.sh
+++ b/modules.d/99fs-lib/fs-lib.sh
@@ -146,11 +146,7 @@ fsck_single() {
     local _drv
 
     [ $# -lt 2 ] && return 255
-    # if UUID= marks more than one device, take only the first one
-    [ -e "$_dev" ] || _dev=$(devnames "$_dev" | while read -r line || [ -n "$line" ]; do if [ -n "$line" ]; then
-        echo "$line"
-        break
-    fi; done)
+    _dev=$(readlink -f "$(label_uuid_to_dev "$_dev")")
     [ -e "$_dev" ] || return 255
     _fs=$(det_fs "$_dev" "$_fs")
     fsck_able "$_fs" || return 255