[PATCH] kernel-modules: inst modules.builtin if there's no modules.builtin.bin

[PATCH] kernel-modules: inst modules.builtin if there's no modules.builtin.bin

[Amadeusz Żołnowski]

Also report failure if none of them exist.
---
 modules.d/90kernel-modules/module-setup.sh |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
index 5f0e4a7..5764bf5 100755
--- a/modules.d/90kernel-modules/module-setup.sh
+++ b/modules.d/90kernel-modules/module-setup.sh
@@ -46,5 +46,14 @@ install() {
     dracut_install $(find /etc/modprobe.d/ -type f -name '*.conf')
     inst_hook cmdline 01 "$moddir/parse-kernel.sh"
     inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh
-    inst "$srcmods/modules.builtin.bin" "/lib/modules/$kernel/modules.builtin.bin"
+
+    local f
+
+    for f in modules.builtin.bin modules.builtin; do
+        [[ $srcmods/$f ]] && inst "$srcmods/$f" "/lib/modules/$kernel/$f" \
+            && break
+    done || {
+        dfatal "No modules.builtin.bin and modules.builtin found!"
+        return 1
+    }
 }
-- 
1.7.5.rc1

Re: [PATCH] kernel-modules: inst modules.builtin if there's no modules.builtin.bin

[Harald Hoyer]

Am 22.04.2011 17:43, schrieb Amadeusz Żołnowski:
> Also report failure if none of them exist.
> ---
>   modules.d/90kernel-modules/module-setup.sh |   11 ++++++++++-
>   1 files changed, 10 insertions(+), 1 deletions(-)
>
> diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
> index 5f0e4a7..5764bf5 100755
> --- a/modules.d/90kernel-modules/module-setup.sh
> +++ b/modules.d/90kernel-modules/module-setup.sh
> @@ -46,5 +46,14 @@ install() {
>       dracut_install $(find /etc/modprobe.d/ -type f -name '*.conf')
>       inst_hook cmdline 01 "$moddir/parse-kernel.sh"
>       inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh
> -    inst "$srcmods/modules.builtin.bin" "/lib/modules/$kernel/modules.builtin.bin"
> +
> +    local f
> +
> +    for f in modules.builtin.bin modules.builtin; do
> +        [[ $srcmods/$f ]]&&  inst "$srcmods/$f" "/lib/modules/$kernel/$f" \
> +&&  break
> +    done || {
> +        dfatal "No modules.builtin.bin and modules.builtin found!"
> +        return 1
> +    }
>   }

pushed! Thank you!