From f629c849414c1f1e6f834f26c0dbdaf31894894e Mon Sep 17 00:00:00 2001
From: Dave Young <dyoung@redhat.com>
Date: Tue, 28 Jun 2016 03:43:03 +0800
Subject: [PATCH] Release 2.0.12-6

---
 kexec-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kexec-tools.spec b/kexec-tools.spec
index 53935ba..ba15fa0 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.12
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component
@@ -316,6 +316,9 @@ done
 %doc
 
 %changelog
+* Mon June 27 2016 Dave Young <dyoung@redhat.com> - 2.0.12-6
+- get_persistent_dev(): fix name contention with dracut's similar function
+
 * Mon Jun 6 2016 Dave Young <dyoung@redhat.com> - 2.0.12-5
 - kdump-lib: Add get_ifcfg_filename() to get the proper ifcfg file
 - module-setup: Use get_ifcfg_filename() to get the proper ifcfg file