Hi Philipp,
On Mon, Aug 01, 2022 at 04:58:49PM +0200, Philipp Rudo wrote:
Hi Coiby,
On Tue, 21 Jun 2022 14:57:19 +0800
Coiby Xu <coxu(a)redhat.com> wrote:
> Signed-off-by: Coiby Xu <coxu(a)redhat.com>
> ---
> dracut-module-setup.sh | 20 ++++----------------
> 1 file changed, 4 insertions(+), 16 deletions(-)
>
> diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
> index 6a836d5..1649805 100755
> --- a/dracut-module-setup.sh
> +++ b/dracut-module-setup.sh
> @@ -415,30 +415,21 @@ kdump_copy_nmconnection_file() {
>
> kdump_setup_bridge() {
> local _netdev=$1
> - local _brif _dev _mac _kdumpdev
> + local _dev
> for _dev in "/sys/class/net/$_netdev/brif/"*; do
> [[ -e $_dev ]] || continue
> _dev=${_dev##*/}
> - _kdumpdev=$_dev
> if kdump_is_bond "$_dev"; then
> (kdump_setup_bond "$_dev"
"$(get_nmcli_connection_apath_by_ifname "$_dev")") || exit 1
> elif kdump_is_team "$_dev"; then
> kdump_setup_team "$_dev"
> elif kdump_is_vlan "$_dev"; then
> kdump_setup_vlan "$_dev"
> - else
> - _mac=$(kdump_get_mac_addr "$_dev")
> - _kdumpdev=$(kdump_setup_ifname "$_dev")
> - echo -n " ifname=$_kdumpdev:$_mac" >>
"${initdir}/etc/cmdline.d/41bridge.conf"
> fi
> - _brif+="$_kdumpdev,"
> + kdump_copy_nmconnection_file "$_dev"
> done
> - echo " bridge=$_netdev:${_brif%,}" >>
"${initdir}/etc/cmdline.d/41bridge.conf"
> }
up to here I'm perfectly fine. For the rest...
> -# drauct takes bond=<bondname>[:<bondslaves>:[:<options>]] syntax
to parse
> -# bond. For example:
> -# bond=bond0:eth0,eth1:mode=balance-rr
> kdump_setup_bond() {
> local _netdev="$1"
> local _conpath="$2"
> @@ -599,7 +590,7 @@ kdump_get_remote_ip() {
> # $1: destination host
> kdump_install_net() {
> local _destaddr _srcaddr _route _netdev _conpath kdumpnic
> - local _static _proto _ip_conf _ip_opts _ifname_opts
> + local _static _proto _ip_conf _ip_opts
> local _znet_netdev _znet_conpath
> # each netowrk interface is managed by a NM connection profile
> declare -A nmconnection_map
> @@ -614,7 +605,6 @@ kdump_install_net() {
> _srcaddr=$(kdump_get_ip_route_field "$_route" "src")
> _netdev=$(kdump_get_ip_route_field "$_route" "dev")
> _conpath=$(get_nmcli_connection_apath_by_ifname "$_netdev")
> - _netmac=$(kdump_get_mac_addr "$_netdev")
> kdumpnic=$(kdump_setup_ifname "$_netdev")
>
> _znet_netdev=$(find_online_znet_device)
> @@ -655,10 +645,8 @@ kdump_install_net() {
> kdump_setup_team "$_netdev"
> elif kdump_is_vlan "$_netdev"; then
> kdump_setup_vlan "$_netdev"
> - else
> - _ifname_opts=" ifname=$kdumpnic:$_netmac"
> - echo "$_ifname_opts" >> "$_ip_conf"
> fi
> + kdump_copy_nmconnection_file "$_netdev"
>
> kdump_setup_dns "$_netdev" "$_conpath"
>
... I don't see how it is related to setting up a network bridge. Does
that need to go into a separate commit?
Sorry for the confusion. I deletd the comments about kdump_setup_bond
by mistake. In v2, I switch to the new approach for different network
setups all at once also to avoid causing trouble for git bisection.
Thanks
Philipp
--
Best regards,
Coiby