Signed-off-by: Coiby Xu <coxu(a)redhat.com>
---
dracut-module-setup.sh | 30 +++++-------------------------
1 file changed, 5 insertions(+), 25 deletions(-)
diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
index d53850b..1b351e9 100755
--- a/dracut-module-setup.sh
+++ b/dracut-module-setup.sh
@@ -409,7 +409,7 @@ kdump_setup_bridge() {
[[ -e $_dev ]] || continue
_dev=${_dev##*/}
if kdump_is_bond "$_dev"; then
- (kdump_setup_bond "$_dev"
"$(get_nmcli_connection_apath_by_ifname "$_dev")") || exit 1
+ (kdump_setup_bond "$_dev") || exit 1
elif kdump_is_team "$_dev"; then
kdump_setup_team "$_dev"
elif kdump_is_vlan "$_dev"; then
@@ -421,30 +421,10 @@ kdump_setup_bridge() {
kdump_setup_bond() {
local _netdev="$1"
- local _conpath="$2"
- local _dev _mac _slaves _kdumpdev _bondoptions
+ local _dev
for _dev in $(cat "/sys/class/net/$_netdev/bonding/slaves"); do
- _mac=$(kdump_get_perm_addr "$_dev")
- _kdumpdev=$(kdump_setup_ifname "$_dev")
- echo -n " ifname=$_kdumpdev:$_mac" >>
"${initdir}/etc/cmdline.d/42bond.conf"
- _slaves+="$_kdumpdev,"
+ kdump_copy_nmconnection_file "$_dev"
done
- echo -n " bond=$_netdev:${_slaves%,}" >>
"${initdir}/etc/cmdline.d/42bond.conf"
-
- _bondoptions=$(get_nmcli_field_by_conpath "bond.options"
"$_conpath")
-
- if [[ -z $_bondoptions ]]; then
- dwarning "Failed to get bond configuration via nmlci output. Now try
sourcing ifcfg script."
- source_ifcfg_file "$_netdev"
- _bondoptions="$(echo "$BONDING_OPTS" | xargs echo | tr "
" ",")"
- fi
-
- if [[ -z $_bondoptions ]]; then
- derror "Get empty bond options"
- exit 1
- fi
-
- echo ":$_bondoptions" >>
"${initdir}/etc/cmdline.d/42bond.conf"
}
kdump_setup_team() {
@@ -482,7 +462,7 @@ kdump_setup_vlan() {
derror "Vlan over bridge is not supported!"
exit 1
elif kdump_is_bond "$_phydev"; then
- (kdump_setup_bond "$_phydev"
"$(get_nmcli_connection_apath_by_ifname "$_phydev")") || exit 1
+ (kdump_setup_bond "$_phydev") || exit 1
echo " vlan=$(kdump_setup_ifname "$_netdev"):$_phydev" >
"${initdir}/etc/cmdline.d/43vlan.conf"
else
_kdumpdev="$(kdump_setup_ifname "$_phydev")"
@@ -630,7 +610,7 @@ kdump_install_net() {
if kdump_is_bridge "$_netdev"; then
kdump_setup_bridge "$_netdev"
elif kdump_is_bond "$_netdev"; then
- (kdump_setup_bond "$_netdev" "$_conpath") || exit 1
+ (kdump_setup_bond "$_netdev") || exit 1
elif kdump_is_team "$_netdev"; then
kdump_setup_team "$_netdev"
elif kdump_is_vlan "$_netdev"; then
--
2.34.1