From fd4bd5552b1b9b293bffde578c7f2ae30cc269c8 Mon Sep 17 00:00:00 2001 From: WANG Chao Date: Tue, 22 Jul 2014 15:54:14 +0800 Subject: [PATCH] dracut-module-setup: avoid writing the vlan.conf twice We handle different types of device for vlan. For each type, it should write different options for vlan.conf in each control path. Signed-off-by: WANG Chao Acked-by: Vivek Goyal --- dracut-module-setup.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh index 87ad072..d2d135b 100755 --- a/dracut-module-setup.sh +++ b/dracut-module-setup.sh @@ -154,8 +154,6 @@ kdump_setup_vlan() { local _phydev="$(awk '/^Device:/{print $2}' /proc/net/vlan/"$_netdev")" local _netmac="$(kdump_get_mac_addr $_phydev)" - echo " vlan=$_netdev:$_phydev" > ${initdir}/etc/cmdline.d/43vlan.conf - #Just support vlan over bond, it is not easy #to support all other complex setup if kdump_is_bridge "$_phydev"; then @@ -166,6 +164,7 @@ kdump_setup_vlan() { exit 1 elif kdump_is_bond "$_phydev"; then kdump_setup_bond "$_phydev" + echo " vlan=$_netdev:$_phydev" > ${initdir}/etc/cmdline.d/43vlan.conf else echo " vlan=$_netdev:$_phydev ifname=$_phydev:$_netmac" > ${initdir}/etc/cmdline.d/43vlan.conf fi