From 68d02c2a53e73235bcbbd9ec5ed7bf6737ff5819 Mon Sep 17 00:00:00 2001
From: Lichen Liu <lichliu@redhat.com>
Date: Thu, 8 Jun 2023 11:02:06 +0800
Subject: [PATCH] Revert "Append both nofail and x-systemd.before to kdump
 mount target"

Resolves: bz2164929
Upstream: Fedora
Conflict: Missing upstream commit
94a7b4("Always drop nofail or nobootwait options")

commit 0843c706723b825653ba4a5d6b1106332d5ed4c8
Author: Kairui Song <kasong@redhat.com>
Date:   Wed Jan 13 17:12:18 2021 +0800

    Revert "Append both nofail and x-systemd.before to kdump mount target"

    That commit is trying to workaround a kernel VFS bug. Now,
    the VFS issue should have been fixed in all recent releases, so
    remove this workaround.

    This reverts commit 539bff40830e961d7ef85248e39bff0e40b23c91.

    Signed-off-by: Kairui Song <kasong@redhat.com>
    Acked-by: Pingfan Liu <piliu@redhat.com>

Signed-off-by: Lichen Liu <lichliu@redhat.com>
---
 mkdumprd | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/mkdumprd b/mkdumprd
index 23013d3..43df102 100644
--- a/mkdumprd
+++ b/mkdumprd
@@ -84,9 +84,6 @@ to_mount() {
     # with 'noauto' in fstab nfs and non-root disk mount will fail in 2nd
     # kernel, filter it out here.
     _options=$(echo $_options | sed 's/\(^\|,\)noauto\($\|,\)/\1/g')
-    # use both nofail and x-systemd.before to ensure systemd will try best to
-    # mount it before kdump starts, this is an attempt to improve robustness
-    _options="$_options,nofail,x-systemd.before=initrd-fs.target"
 
     echo "$_pdev $_new_mntpoint $_fstype $_options"
 }