From: Jeremiah McConnell <miah@miah.com>
Date: Fri, 15 Jun 2018 23:34:50 +0000 (-0600)
Subject: lvm2: use explicit run/lock dir defaults
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=eebe024835d27f8457005ba30817703435a11f18;p=feed%2Fpackages.git

lvm2: use explicit run/lock dir defaults

The configure scripts for lvm2 guess defaults for run/lock based on if
/run exists on the build host.  Use explicit values for the defaults
for consistency across build hosts.

Signed-off-by: Jeremiah McConnell <miah@miah.com>
---

diff --git a/utils/lvm2/Makefile b/utils/lvm2/Makefile
index f90f6ea732..497668e944 100644
--- a/utils/lvm2/Makefile
+++ b/utils/lvm2/Makefile
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2009-2010 Stefan Monnier
-# Copyright (C) 2011-2014 OpenWrt.org
+# Copyright (C) 2011-2018 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v3+.
 # See /LICENSE for more information.
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=LVM2
 PKG_VERSION:=2.02.177
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=GPL-2.0 LGPL-2.1
 
 PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
@@ -50,7 +50,12 @@ define Package/lvm2/description
  LVM toolset.
 endef
 
-CONFIGURE_ARGS += --disable-o_direct
+CONFIGURE_ARGS += \
+  --disable-o_direct \
+  --with-default-pid-dir=/var/run \
+  --with-default-dm-run-dir=/var/run \
+  --with-default-run-dir=/var/run/lvm \
+  --with-default-locking-dir=/var/lock/lvm
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \