From c79b2919239a4120f599c16785bfbb7eb11d90bc Mon Sep 17 00:00:00 2001
From: David Lehman <dlehman@redhat.com>
Date: Tue, 28 Oct 2014 12:41:24 -0500
Subject: [PATCH] Don't include the stock lvm.conf.

We started including it as an unintended side-effect of commit 9ca487f8.

lvm doesn't like it when there are multiple 'global' sections in lvm.conf,
and we add one right at the end of that block. We expect ours to be the
file's only content.

(cherry picked from commit 4a7552d4be269d4a2f9beef7cf23a8bebf8f27d8)

Related: rhbz#1149992
---
 share/runtime-postinstall.tmpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/share/runtime-postinstall.tmpl b/share/runtime-postinstall.tmpl
index bdba76a0..aab7f5b7 100644
--- a/share/runtime-postinstall.tmpl
+++ b/share/runtime-postinstall.tmpl
@@ -121,6 +121,7 @@ remove etc/lvm/backup/*
 remove etc/lvm/backup
 remove etc/lvm/cache/*
 remove etc/lvm/cache
+remove etc/lvm/lvm.conf
 append etc/lvm/lvm.conf "global {\n\tuse_lvmetad = 1\n}\n"
 
 ## TODO: we could run prelink here if we wanted?