From: Harald Hoyer <harald@redhat.com>
Date: Mon, 2 Dec 2013 09:32:00 +0000 (+0100)
Subject: dracut.sh:_get_fs_type() if block device exists return early
X-Git-Tag: 035~87
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e41f3f902512a91a286e14d6ffa52206c70ea5f6;p=thirdparty%2Fdracut.git

dracut.sh:_get_fs_type() if block device exists return early

even, if no ID_FS_TYPE was found, return if the block device exists
---

diff --git a/dracut.sh b/dracut.sh
index bce2662fe..177b81331 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -987,12 +987,12 @@ unset rest
 
 _get_fs_type() {
     [[ $1 ]] || return
-    if [[ -b /dev/block/$1 ]] && ID_FS_TYPE=$(get_fs_env "/dev/block/$1"); then
-        host_fs_types["$(readlink -f "/dev/block/$1")"]="$ID_FS_TYPE"
+    if [[ -b /dev/block/$1 ]]; then
+        ID_FS_TYPE=$(get_fs_env "/dev/block/$1") && host_fs_types["$(readlink -f "/dev/block/$1")"]="$ID_FS_TYPE"
         return 1
     fi
-    if [[ -b $1 ]] && ID_FS_TYPE=$(get_fs_env "$1"); then
-        host_fs_types["$(readlink -f "$1")"]="$ID_FS_TYPE"
+    if [[ -b $1 ]]; then
+        ID_FS_TYPE=$(get_fs_env "$1") && host_fs_types["$(readlink -f "$1")"]="$ID_FS_TYPE"
         return 1
     fi
     if fstype=$(find_dev_fstype "$1"); then