lvm2: set cache directory to /tmp/lvm/cache

Signed-off-by: Maxim Storchak <m.storchak@gmail.com>

diff --git a/utils/lvm2/Makefile b/utils/lvm2/Makefile
index 935f213f3f76d3b7ed9f99cf79a2ede0724d778e..803a279fd0c24d731c1ebdbe07204c02e9985009 100644 (file)
--- a/utils/lvm2/Makefile
+++ b/utils/lvm2/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=LVM2
 PKG_VERSION:=2.02.116
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=GPL-2.0 LGPL-2.1
 
 PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
@@ -76,7 +76,7 @@ define Package/lvm2/install
        $(INSTALL_DIR) $(1)/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/lvm $(1)/sbin
        $(INSTALL_DIR) $(1)/etc/lvm
-       $(SED) '/^[[:space:]]*\(#\|$$$$\)/d' $(PKG_BUILD_DIR)/conf/example.conf
+       $(SED) '/^[[:space:]]*\(#\|$$$$\)/d; /cache_dir/s@.*@    cache_dir = "/tmp/lvm/cache"@' $(PKG_BUILD_DIR)/conf/example.conf
        $(INSTALL_CONF) $(PKG_BUILD_DIR)/conf/example.conf $(1)/etc/lvm/lvm.conf
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/lvm2.init $(1)/etc/init.d/lvm2

diff --git a/utils/lvm2/files/lvm2.init b/utils/lvm2/files/lvm2.init
index 3b542d0238993f2dfc77f2ca9f3953049d0041c9..4faf5d5da8cf4204e9a7234c8faafe1a02eed15a 100644 (file)
--- a/utils/lvm2/files/lvm2.init
+++ b/utils/lvm2/files/lvm2.init
@@ -3,10 +3,12 @@
 START=15
 
 start () {
-   /sbin/lvm vgscan --ignorelockingfailure --mknodes || :
-   /sbin/lvm vgchange -aly --ignorelockingfailure || return 2
+       mkdir -p /tmp/lvm/cache
+       /sbin/lvm vgscan --ignorelockingfailure --mknodes || :
+       /sbin/lvm vgchange -aly --ignorelockingfailure || return 2
 }
 
 stop () {
-    /sbin/lvm vgchange -aln --ignorelockingfailure || return 2
+       mkdir -p /tmp/lvm/cache
+       /sbin/lvm vgchange -aln --ignorelockingfailure || return 2
 }