From 10dea66fde9b26938c797e27ec16e64fb9aafc4026ea9c0aef69e760668c9b28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= <ptesarik@suse.com>
Date: Fri, 9 Feb 2018 16:11:55 +0000
Subject: [PATCH] Accepting request 574761 from
 home:ptesarik:branches:Kernel:kdump

- kdump-bail-out-if-no-default-interface.patch: Bail out of
  kdump_check_net if no default interface is found (bsc#1058202).

OBS-URL: https://build.opensuse.org/request/show/574761
OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kdump?expand=0&rev=148
---
 kdump-bail-out-if-no-default-interface.patch | 33 ++++++++++++++++++++
 kdump.changes                                |  6 ++++
 kdump.spec                                   |  2 ++
 3 files changed, 41 insertions(+)
 create mode 100644 kdump-bail-out-if-no-default-interface.patch

diff --git a/kdump-bail-out-if-no-default-interface.patch b/kdump-bail-out-if-no-default-interface.patch
new file mode 100644
index 0000000..f74c413
--- /dev/null
+++ b/kdump-bail-out-if-no-default-interface.patch
@@ -0,0 +1,33 @@
+From: Petr Tesarik <ptesarik@suse.com>
+Date: Fri, 9 Feb 2018 16:55:55 +0100
+Subject: Bail out of kdump_check_net if no default interface is found
+References: bsc#1058202
+Upstream: merged
+Git-commit: 0f07085aac4f506752e2cd41a43b34b85f3f09aa
+
+If network is required but no default interface is found, dracut
+spits spurious errors, such as:
+
+/lib/kdump/setup-kdump.functions: line 471: /sys/class/net//addr_assign_type: No such file or directory
+/lib/kdump/setup-kdump.functions: line 472: [: : integer expression expected
+/lib/kdump/setup-kdump.functions: line 476: ethtool: command not found
+
+Signed-off-by: Petr Tesarik <ptesarik@suse.com>
+---
+ init/module-setup.sh |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/init/module-setup.sh
++++ b/init/module-setup.sh
+@@ -33,6 +33,11 @@ kdump_check_net() {
+     if [ "$kdump_host_if" = "default" ] ; then
+ 	kdump_host_if=$(kdump_default_netdev)
+     fi
++    if [ -z "$kdump_host_if" ] ; then
++        kdump_neednet=
++        return 1
++    fi
++
+     if [ "$kdump_net_mode" = "auto" ] ; then
+ 	kdump_net_mode=$(kdump_netdev_mode "$kdump_host_if")
+     fi
diff --git a/kdump.changes b/kdump.changes
index d93a333..3d4df3b 100644
--- a/kdump.changes
+++ b/kdump.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Feb  9 16:09:48 UTC 2018 - ptesarik@suse.com
+
+- kdump-bail-out-if-no-default-interface.patch: Bail out of
+  kdump_check_net if no default interface is found (bsc#1058202).
+
 -------------------------------------------------------------------
 Thu Feb  8 18:38:43 UTC 2018 - ptesarik@suse.com
 
diff --git a/kdump.spec b/kdump.spec
index 8b4784d..a3618df 100644
--- a/kdump.spec
+++ b/kdump.spec
@@ -82,6 +82,7 @@ Patch32:        %{name}-fix-m_threads-missing-initialization.patch
 Patch33:        %{name}-calibrate-adjust-sizeof-struct-page.patch 
 Patch34:        %{name}-calibrate-update-kernel-text-data-size.patch 
 Patch35:        %{name}-calibrate-update-user-space-requirements.patch 
+Patch36:        %{name}-bail-out-if-no-default-interface.patch
 BuildRequires:  asciidoc
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
@@ -179,6 +180,7 @@ cp %{S:1} tests/data/
 %patch33 -p1
 %patch34 -p1
 %patch35 -p1
+%patch36 -p1
 
 %build
 export CFLAGS="%{optflags}"