From 84674432f1629f224d016e347ab263740f285b04 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 10 2014 14:02:01 +0000
Subject: import kexec-tools-2.0.4-32.el7_0.1


---

diff --git a/SOURCES/mkdumprd b/SOURCES/mkdumprd
index 1a6d21d..2801eaa 100644
--- a/SOURCES/mkdumprd
+++ b/SOURCES/mkdumprd
@@ -103,7 +103,9 @@ to_mount() {
     _t=$(findmnt -k -f -n -r -o TARGET,FSTYPE $_dev)
     _o=$(findmnt -k -f -n -r -o OPTIONS $_dev)
     _o=${_o/#ro/rw} #mount fs target as rw in 2nd kernel
-    _o="${_o},nofail" #with nofail set, systemd won't block for mount failure
+    # "nofail" mount could be run later than kdump.sh. So we don't pass nofail
+    # for short term.
+    #_o="${_o},nofail" #with nofail set, systemd won't block for mount failure
     _mntopts="$_t $_o"
     #for non-nfs _dev converting to use udev persistent name
     if [ -b "$_s" ]; then
diff --git a/SPECS/kexec-tools.spec b/SPECS/kexec-tools.spec
index 03997d5..ea15bfa 100644
--- a/SPECS/kexec-tools.spec
+++ b/SPECS/kexec-tools.spec
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.4
-Release: 32%{?dist}
+Release: 32%{?dist}.1
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -374,6 +374,9 @@ done
 %endif
 
 %changelog
+* Fri May 09 2014 WANG Chao <chaowang@redhat.com> - 2.0.4-32.1
+- remove "nofail" from mount options
+
 * Wed Apr 30 2014 Madper Xie <cxie@redhat.com> - 2.0.4-32
 - spec: fix wrong source id