File kdump-net-0010-vlan-from-wicked.patch of Package kdump
From: Petr Tesarik <ptesarik@suse.com>
Date: Fri, 2 Sep 2016 08:44:14 +0200
Subject: Prefer wicked for VLAN configuration
References: bsc#980328
Patch-mainline: v0.8.16
Git-commit: 45b1327997bbe5656b231e2c28f99ebb07930c3c
If available, use wicked to obtain VLAN configuration.
Signed-off-by: Petr Tesarik <ptesarik@suse.com>
---
init/setup-kdump.functions | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
--- a/init/setup-kdump.functions
+++ b/init/setup-kdump.functions
@@ -335,9 +335,24 @@ function kdump_link2vlan()
function kdump_vlan_config() # {{{
{
local if="$1"
- local vid=$(ip -d link show "$if" | kdump_link2vlan)
- local slaves=$(kdump_list_slaves "$if")
- if="${slaves# }"
+ local vid
+
+ # use wicked to read VLAN configuration, if possible
+ if [ -n "$(type -P wicked)" ]
+ then
+ eval $( wicked show-config |
+ wicked xpath --reference "/interface[name='$if']" \
+ "vid=%{vlan/tag}; if=%{vlan/device}" )
+ fi
+
+ # fall back to sysfs
+ if [ -z "$vid" ]
+ then
+ vid=$(ip -d link show "$if" | kdump_link2vlan)
+ local slaves=$(kdump_list_slaves "$if")
+ if="${slaves# }"
+ fi
+
kdump_ifname_config "$if"
iface="$if.$vid"
echo -n " vlan=$iface:$if"