main/lvm2: use mlockall by default

this works around issue with the "smart" memory locking
fixes #3107

(cherry picked from commit 7cfe57d546e6a336fc5e0eb9c305bb9c3707bee2)

2 files changed, 16 insertions, 1 deletions

diff --git a/main/lvm2/APKBUILD b/main/lvm2/APKBUILD
index bc61afeaeb..2acc1c0b7b 100644
--- a/main/lvm2/APKBUILD
+++ b/main/lvm2/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lvm2
 pkgver=2.02.122
-pkgrel=0
+pkgrel=1
 pkgdesc="Logical Volume Manager 2 utilities"
 url="http://sourceware.org/lvm2/"
 arch="all"
@@ -12,6 +12,7 @@ makedepends="$depends_dev"
 source="ftp://sources.redhat.com/pub/$pkgname/LVM2.$pkgver.tgz
         fix-stdio-usage.patch
         mallinfo.patch
+        mlockall-default-config.patch
         lvm.initd
         lvm.confd
         dmeventd.initd
@@ -93,18 +94,21 @@ libs() {
 md5sums="a88bf7d68955635d009a5aec1ffecc48  LVM2.2.02.122.tgz
 2395ae17f924ebf25e9737d02f758f8f  fix-stdio-usage.patch
 3f4a9d57620f240f6bf389c1debc2ba5  mallinfo.patch
+67429b087621319a13a9f3840e693b49  mlockall-default-config.patch
 cdefa1dbd95caabbf92198764f18a54e  lvm.initd
 ec36d5fe4561220304e406c5c797e71f  lvm.confd
 3bec717f7092c1934909962d38038eb3  dmeventd.initd"
 sha256sums="73b99aba954718760d10647f27b3148cf67ddbb2a3e8be75c010fdbcf0b7c6f4  LVM2.2.02.122.tgz
 79c5379cbf660f8dabd45359463c77a40b5a83153b54c67ce36049260dac9071  fix-stdio-usage.patch
 40d2def3e99c13e3ecbaeb79bb863f42e7ae0e47762ebbc0d025962022a6dc3c  mallinfo.patch
+4b5aac7007296080979e6a56831412045cff5490538c77cabf0472a8e382f9e3  mlockall-default-config.patch
 9eea2a296d63794f6200351a625d317e028c0cafcbb6ad6083ea98acc5454e29  lvm.initd
 e2ff57977ace6098e1a2efc8a1f6796e8bf6e5dd148e4c105bb647ffc6f79230  lvm.confd
 05fad3581e8c22ecd81c78aa97fd79b521e622963d519d2d200a06823007d48d  dmeventd.initd"
 sha512sums="f22ff60ea2b60a120b19c571cba93892766c17df6a5a7ed7a0257065ae9122cd5affdc82e9ef9aef134e0b2b0b51d5d680ffd816202b2f241c90403ab3c74d0a  LVM2.2.02.122.tgz
 c4d55b366a60926baadf431dd382012eb808490c0bb514e01503d526cfd7ae573efa2d60a92bd5f6f451b54b11fb5cf827f45cec35cfcdee6aa291674cc776dd  fix-stdio-usage.patch
 9272ec8c5184ef5dc776ead8f74132e072b7563b5119a3a38b712f00d92a1e3878c9b3a54eb2b01dcba038110c686b39d4c17ecd0eb258537e9217d7ed03c408  mallinfo.patch
+0e5bc8c2629013704083ef8e8bf79897c660b59772ddaff242258ebed89c7453f61c7a0fe8729f9f61474a0b5bfcdd2a0d3ff4f28069dd74c39228ca034a8626  mlockall-default-config.patch
 a853078660fd2fd943538924f56e81dc5793294e26b8f61d93e6188893f15f4a438d33792b341c1865d61e03f4a371b7c7ee0db5f4130ef7cb7aeaeb9290086a  lvm.initd
 07caf8fa942290f3c953cc2463aaf55bac01d0bcb9351daf3880fa4d0eefb67fe00761c46a7a4da91cd2f8e492a12fed35853a15dc939cd80d19d3303bc3951d  lvm.confd
 ca06220065525e93347efb7a5746a367cf55cb03574e50eed29bd7c4eae036bdd199b52c42d81811b6e742649e73ab8e66525f663bed66f9d1d82d0efde50332  dmeventd.initd"
diff --git a/main/lvm2/mlockall-default-config.patch b/main/lvm2/mlockall-default-config.patch
new file mode 100644
index 0000000000..78eecf0a76
--- /dev/null
+++ b/main/lvm2/mlockall-default-config.patch
@@ -0,0 +1,11 @@
+--- ./conf/example.conf.in.orig
++++ ./conf/example.conf.in
+@@ -1246,7 +1246,7 @@
+        # Use the old behavior of mlockall to pin all memory.
+        # Prior to version 2.02.62, LVM used mlockall() to pin
+        # the whole process's memory while activating devices.
+-       use_mlockall = 0
++       use_mlockall = 1
+ 
+        # Configuration option activation/monitoring.
+        # Monitor LVs that are activated.