- findmodule -> find_module

- pack_version -> kernel_version

svn-id: @10170

diff --git a/mod-dmraid.sh b/mod-dmraid.sh
index b8f2bf15dfa1e79188977adc38d3221fee6f3aa8..6db1024f881ab46bba771237f07a4f00ebb56773 100644 (file)
--- a/mod-dmraid.sh
+++ b/mod-dmraid.sh
@@ -51,7 +51,7 @@ find_modules_dmraid() {
                return 1
        fi
 
-       findmodule "dm-mirror"
+       find_module "dm-mirror"
        have_dmraid=yes
        return 0
 }

diff --git a/mod-ide.sh b/mod-ide.sh
index 0dfd82adc4b4bd63bf2203f9d62733a7c635b992..21d0caf42d23a57e3b8924014f477878f2d78278 100644 (file)
--- a/mod-ide.sh
+++ b/mod-ide.sh
@@ -40,10 +40,10 @@ find_modules_ide() {
        local rootblkdev=${disk#/dev/}
 
        local n
-       if [ "$pack_version_long" -lt "002004021" ]; then
+       if [ "$kernel_version_long" -lt "002004021" ]; then
                debug "Finding IDE modules for kernels <= 2.4.20"
                for n in $PREIDEMODSOLD; do
-                       findmodule "$n"
+                       find_module "$n"
                done
        else
                local tryauto=1
@@ -53,7 +53,7 @@ find_modules_ide() {
                                local mod idemodules=$(modprobe_conf | awk '/ide_hostadapter/ && ! /^[\t ]*#/ { print $3; }')
                                for mod in $idemodules; do
                                        tryauto=0;
-                                       findmodule "$mod"
+                                       find_module "$mod"
                                done
 
                                if [ "$tryauto" -eq 1 ]; then
@@ -114,7 +114,7 @@ find_modules_ide() {
 
                                                # }}}
                                                for nd in $idemodules; do
-                                                       findmodule "-$nd"
+                                                       find_module "-$nd"
                                                done
                                        # }}}
                                        # else tryauto {{{
@@ -126,7 +126,7 @@ find_modules_ide() {
                                        # }}}
                                fi
                        else
-                               findmodule "$n"
+                               find_module "$n"
                        fi
                done
        fi

diff --git a/mod-luks.sh b/mod-luks.sh
index b02e2a7a5adcb4c4742b42a3d74ddd7c1b7fb59f..01ca4bb861a821f4dad93504955cd6b1cf52df3b 100644 (file)
--- a/mod-luks.sh
+++ b/mod-luks.sh
@@ -62,11 +62,11 @@ find_modules_luks() {
                die "Lost cryptsetup device meanwhile?"
        fi
 
-       findmodule "dm-crypt"
+       find_module "dm-crypt"
 
        # TODO: autodetect
-       findmodule "aes"
-       findmodule "cbc"
+       find_module "aes"
+       find_module "cbc"
 
        have_luks=yes
 

diff --git a/mod-lvm.sh b/mod-lvm.sh
index 894605e7d91efb2b264127eaf40a40601c833091..b44c0543d54ad41d2f8feab353dafd939a8754c6 100644 (file)
--- a/mod-lvm.sh
+++ b/mod-lvm.sh
@@ -96,10 +96,10 @@ find_modules_lvm() {
        fi
 
        if [ "$LVMTOOLSVERSION" = "2" ]; then
-               findmodule "-dm-mod"
+               find_module "-dm-mod"
        elif [ "$LVMTOOLSVERSION" = "1" ]; then
-               findmodule "-lvm"
-               findmodule "-lvm-mod"
+               find_module "-lvm"
+               find_module "-lvm-mod"
        else
                die "LVM version $LVMTOOLSVERSION is not supported yet."
        fi

diff --git a/mod-multipath.sh b/mod-multipath.sh
index 3b45c618d5dd7a1d9c4d6a73e2dcce8091bd5517..9af9b6e781e4be3f2d8e8fee50de2d2bb9ccd806 100644 (file)
--- a/mod-multipath.sh
+++ b/mod-multipath.sh
@@ -82,15 +82,15 @@ find_modules_multipath() {
 
        local hw hwhandlers=$(echo "$info" | awk '/hwhandler=1/{sub(/.*hwhandler=1 /, ""); sub(/\]$/, ""); print}')
        for hw in $hwhandlers; do
-               findmodule "dm-$hw"
+               find_module "dm-$hw"
        done
 
        local target targets=$(echo "$info" | awk '/prio=/{print $2}' | sort -u)
        for target in $targets; do
-               findmodule "dm-$target"
+               find_module "dm-$target"
        done
 
-       findmodule "dm-mod"
+       find_module "dm-mod"
        return 0
 }