modules.d/*/module-setup.sh: no more sourcing of dracutfunctions

diff --git a/modules.d/90btrfs/module-setup.sh b/modules.d/90btrfs/module-setup.sh
index 135abc65bc0f7104c8ddd35bf734e9e72de8c117..7d8fae018af63792cf8878ca8e7b69a3c3b0ef29 100755 (executable)
--- a/modules.d/90btrfs/module-setup.sh
+++ b/modules.d/90btrfs/module-setup.sh
@@ -8,9 +8,6 @@ check() {
     # no point in trying to support it in the initramfs.
     type -P btrfs >/dev/null || return 1
 
-    . $dracutfunctions
-    [[ $debug ]] && set -x
-
     [[ $hostonly ]] || [[ $mount_needs ]] && {
         local _found
         for fs in ${host_fs_types[@]}; do

diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh
index 5082434aaf95a26f64b7e198c2154b38bcddba26..16d6f891f171d823a21a0772fa80f80120e1e13a 100755 (executable)
--- a/modules.d/90crypt/module-setup.sh
+++ b/modules.d/90crypt/module-setup.sh
@@ -7,8 +7,6 @@ check() {
     # if cryptsetup is not installed, then we cannot support encrypted devices.
     type -P cryptsetup >/dev/null || return 1
 
-    . $dracutfunctions
-
     check_crypt() {
         local dev=$1 fs=$2
         [[ $fs = "crypto_LUKS" ]] || return 1

diff --git a/modules.d/90dmraid/module-setup.sh b/modules.d/90dmraid/module-setup.sh
index 5ce705144f9cbfe80a452befd9c5776e35f6b3db..dad54a4affeee7ff88c78765f69bac332ff65bbb 100755 (executable)
--- a/modules.d/90dmraid/module-setup.sh
+++ b/modules.d/90dmraid/module-setup.sh
@@ -8,9 +8,6 @@ check() {
     # in trying to support it in the initramfs.
     type -P dmraid >/dev/null || return 1
 
-    . $dracutfunctions
-    [[ $debug ]] && set -x
-
     check_dmraid() {
         local dev=$1 fs=$2 holder DEVPATH DM_NAME
         [[ "$fs" = "${fs%%_raid_member}" ]] && return 1

diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
index 2ce5c501e7404f544ecd4715f6cbf8f056ec7d73..5182b798ffb5494d0c1f50f858e326d3d549489a 100755 (executable)
--- a/modules.d/90lvm/module-setup.sh
+++ b/modules.d/90lvm/module-setup.sh
@@ -7,9 +7,6 @@ check() {
     # No point trying to support lvm if the binaries are missing
     type -P lvm >/dev/null || return 1
 
-    . $dracutfunctions
-    [[ $debug ]] && set -x
-
     check_lvm() {
         local DM_VG_NAME DM_LV_NAME DM_UDEV_DISABLE_DISK_RULES_FLAG
         eval $(udevadm info --query=property --name=$1|egrep '(DM_VG_NAME|DM_LV_NAME|DM_UDEV_DISABLE_DISK_RULES_FLAG)=')

diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh
index 350aff81c483244a79a90e720fc8527ac067e3c1..56f881e19c6c2ad652193f8774c34737757c9f62 100755 (executable)
--- a/modules.d/90mdraid/module-setup.sh
+++ b/modules.d/90mdraid/module-setup.sh
@@ -7,9 +7,6 @@ check() {
     # No mdadm?  No mdraid support.
     type -P mdadm >/dev/null || return 1
 
-    . $dracutfunctions
-    [[ $debug ]] && set -x
-
     check_mdraid() {
         local dev=$1 fs=$2 holder DEVPATH MD_UUID
         [[ "$fs" = "${fs%%_raid_member}" ]] && return 1

diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh
index 87915604a2411e407cfc839e0f75639409cf19cb..bfa4bf8920fe1336bf5a7cdc3515920cb3857c30 100755 (executable)
--- a/modules.d/90multipath/module-setup.sh
+++ b/modules.d/90multipath/module-setup.sh
@@ -7,9 +7,6 @@ check() {
     # if there's no multipath binary, no go.
     type -P multipath >/dev/null || return 1
 
-    . $dracutfunctions
-    [[ $debug ]] && set -x
-
     is_mpath() {
         local _dev
         _dev=$(get_maj_min $1)

diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
index 5f935d7a0da8ad04968c40ea7c22eee9b2ae5f6b..1787f922cd1b7ed2826649498d2cef6ef3aa8081 100755 (executable)
--- a/modules.d/95iscsi/module-setup.sh
+++ b/modules.d/95iscsi/module-setup.sh
@@ -10,10 +10,6 @@ check() {
     # If hostonly was requested, fail the check if we are not actually
     # booting from root.
 
-    . $dracutfunctions
-
-    [[ $debug ]] && set -x
-
     is_iscsi() (
         local _dev
         _dev=$(get_maj_min $1)

diff --git a/modules.d/95nbd/module-setup.sh b/modules.d/95nbd/module-setup.sh
index c0f71ccfb707a9df257296c87827139dbd547199..092aade4c7540f41449e4cb6b742603623a69205 100755 (executable)
--- a/modules.d/95nbd/module-setup.sh
+++ b/modules.d/95nbd/module-setup.sh
@@ -11,7 +11,6 @@ check() {
     # mounted on, fail the hostonly check.
     [[ $hostonly ]] || [[ $mount_needs ]] && {
         is_nbd() { [[ -b /dev/block/$1 && $1 == 43:* ]] ;}
-        . $dracutfunctions
 
         _rootdev=$(find_root_block_device)
         [[ -b /dev/block/$_rootdev ]] || return 1