* [PATCH] kernel-modules: inst modules.builtin if there's no modules.builtin.bin
@ 2011-04-22 15:43 Amadeusz Żołnowski
[not found] ` <1303486991-8133-1-git-send-email-aidecoe-2qtfh70TtYba5EbDDlwbIw@public.gmane.org>
0 siblings, 1 reply; 2+ messages in thread
From: Amadeusz Żołnowski @ 2011-04-22 15:43 UTC (permalink / raw)
To: initramfs-u79uwXL29TY76Z2rM5mHXA; +Cc: 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] kernel-modules: inst modules.builtin if there's no modules.builtin.bin
[not found] ` <1303486991-8133-1-git-send-email-aidecoe-2qtfh70TtYba5EbDDlwbIw@public.gmane.org>
@ 2011-04-28 13:45 ` Harald Hoyer
0 siblings, 0 replies; 2+ messages in thread
From: Harald Hoyer @ 2011-04-28 13:45 UTC (permalink / raw)
To: Amadeusz Żołnowski; +Cc: initramfs-u79uwXL29TY76Z2rM5mHXA
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!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-04-28 13:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-22 15:43 [PATCH] kernel-modules: inst modules.builtin if there's no modules.builtin.bin Amadeusz Żołnowski
[not found] ` <1303486991-8133-1-git-send-email-aidecoe-2qtfh70TtYba5EbDDlwbIw@public.gmane.org>
2011-04-28 13:45 ` Harald Hoyer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox