From: David Tardon <dtardon@redhat.com>
Date: Mon, 15 Aug 2022 06:35:59 +0000 (+0200)
Subject: refactor(convertfs): drop duplicate def. of ismounted()
X-Git-Tag: 058~187
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=101b683e1a2de2762d93120dbbe44a0b44666b7e;p=thirdparty%2Fdracut.git

refactor(convertfs): drop duplicate def. of ismounted()
---

diff --git a/modules.d/30convertfs/convertfs.sh b/modules.d/30convertfs/convertfs.sh
index 20cbe4b03..58fa56df7 100755
--- a/modules.d/30convertfs/convertfs.sh
+++ b/modules.d/30convertfs/convertfs.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+type ismounted > /dev/null 2>&1 || . /lib/dracut-lib.sh
+
 ROOT="$1"
 
 if [[ ! -d $ROOT ]]; then
@@ -79,26 +81,6 @@ find_mount() {
     return 1
 }
 
-# usage: ismounted <mountpoint>
-# usage: ismounted /dev/<device>
-if command -v findmnt > /dev/null; then
-    ismounted() {
-        findmnt "$1" > /dev/null 2>&1
-    }
-else
-    ismounted() {
-        if [ -b "$1" ]; then
-            find_mount "$1" > /dev/null && return 0
-            return 1
-        fi
-
-        while read -r _ m _ || [ -n "$m" ]; do
-            [ "$m" = "$1" ] && return 0
-        done < /proc/mounts
-        return 1
-    }
-fi
-
 # clean up after ourselves no matter how we die.
 cleanup() {
     echo "Something failed. Move back to the original state"
diff --git a/modules.d/30convertfs/module-setup.sh b/modules.d/30convertfs/module-setup.sh
index f219ea7e7..68fb78f8e 100755
--- a/modules.d/30convertfs/module-setup.sh
+++ b/modules.d/30convertfs/module-setup.sh
@@ -8,8 +8,7 @@ check() {
 
 # called by dracut
 depends() {
-    echo bash
-    return 0
+    echo base bash
 }
 
 # called by dracut