[PATCH] adjust the installkernel function to make it return correct value

[Baoquan He]

The old implementation in installkernel() will not return success when
added wdt module is not iTCO_wdt. The returned value is related to the
comparison. This is not correct and will cause kdump load failed.

Now move the exact wdt module inserting to the right place, this can
be fixed.

Signed-off-by: Baoquan He 
---
 dracut-module-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
index 4e7d5dc..bdadf7c 100755
--- a/dracut-module-setup.sh
+++ b/dracut-module-setup.sh
@@ -489,7 +489,7 @@ install() {
 installkernel() {
     wdt=$(lsmod|cut -f1 -d' '|grep "wdt$")
     if [ -n "$wdt" ]; then
-        instmods $wdt
         [ "$wdt" = "iTCO_wdt" ] && instmods lpc_ich
+        instmods $wdt
     fi
 }

[Vivek Goyal]

On Fri, Feb 28, 2014 at 04:25:36PM +0800, Baoquan He wrote:
> The old implementation in installkernel() will not return success when
> added wdt module is not iTCO_wdt. The returned value is related to the
> comparison. This is not correct and will cause kdump load failed.
>
> Now move the exact wdt module inserting to the right place, this can
> be fixed.
>
> Signed-off-by: Baoquan He

Looks good to me.

Acked-by: Vivek Goyal

Vivek
> dracut-module-setup.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
> index 4e7d5dc..bdadf7c 100755
> --- a/dracut-module-setup.sh
> +++ b/dracut-module-setup.sh
> @@ -489,7 +489,7 @@ install() {
>  installkernel() {
>      wdt=$(lsmod|cut -f1 -d' '|grep "wdt$")
>      if [ -n "$wdt" ]; then
>    instmods $wdt
>    [ "$wdt" = "iTCO_wdt" ] && instmods lpc_ich
>    instmods $wdt
> fi
> }
>
> 1.8.3.1
>
> kexec mailing list
> [e-mail]
> https://lists.fedoraproject.org/mailman/listinfo/kexec