From 0ebd803f45fb90aeb8e75ab987c38a994d2d7d23 Mon Sep 17 00:00:00 2001
From: Tao Liu <ltao@redhat.com>
Date: Nov 10 2021 02:27:11 +0000
Subject: mkdumprd: drop mountaddr/mountproto nfs mount options


upstream: fedora
resolves: bz1982535
conflict: none

commit 727251e52efe833b8bb428b5567fca34f8c74b3d
Author: Tao Liu <ltao at redhat.com>
Date:   Tue Oct 26 22:03:28 2021 +0800

    mkdumprd: drop mountaddr/mountproto nfs mount options

    nfs service will append extra mount options to kernel mount options.
    Such as mountaddr/mountproto options. These options only represent
    current mounting details of the 1st kernel, but may not appropriate
    for the 2nd kernel for the same reason as commit
    d4f04afa47dea89ad5ca42ad0b2ddc355ce93a64 ("mkdumprd: drop some nfs
                    mount options when reading from kernel"). This patch will remove
    these options.

    Signed-off-by: Tao Liu <ltao@redhat.com>
    Acked-by: Coiby Xu <coxu@redhat.com>

Signed-off-by: Tao Liu <ltao@redhat.com>

---

diff --git a/mkdumprd b/mkdumprd
index c6cb001..d87d588 100644
--- a/mkdumprd
+++ b/mkdumprd
@@ -70,8 +70,8 @@ to_mount()
 
 	if [[ $_fstype == "nfs"* ]]; then
 		_pdev=$_target
-		_sed_cmd+='s/,addr=[^,]*//;'
-		_sed_cmd+='s/,proto=[^,]*//;'
+		_sed_cmd+='s/,\(mount\)\?addr=[^,]*//g;'
+		_sed_cmd+='s/,\(mount\)\?proto=[^,]*//g;'
 		_sed_cmd+='s/,clientaddr=[^,]*//;'
 	else
 		# for non-nfs _target converting to use udev persistent name