From be05d69d9f75822e37f283ebb7a6823e2dc46d7f Mon Sep 17 00:00:00 2001 From: Natanael Copa <ncopa@alpinelinux.org> Date: Wed, 25 Nov 2015 17:13:11 +0000 Subject: [PATCH] main/lvm2: set mlockall by default in the binary set mlockall by default not only in the config but also in the binary so this is used from initramfs where there is no config. --- main/lvm2/APKBUILD | 8 ++++---- main/lvm2/mlockall-default-config.patch | 13 +++++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/main/lvm2/APKBUILD b/main/lvm2/APKBUILD index e928647cc5f0..94f1aacab27a 100644 --- a/main/lvm2/APKBUILD +++ b/main/lvm2/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lvm2 pkgver=2.02.135 -pkgrel=0 +pkgrel=1 pkgdesc="Logical Volume Manager 2 utilities" url="http://sourceware.org/lvm2/" arch="all" @@ -97,7 +97,7 @@ md5sums="84b42f46fa87eee713d38fa652084a19 LVM2.2.02.135.tgz 2395ae17f924ebf25e9737d02f758f8f fix-stdio-usage.patch 3f4a9d57620f240f6bf389c1debc2ba5 mallinfo.patch d718e3301f035ebd2e2bbf25df34e817 library_dir-default-config.patch -42ad8de153db667e82ae2e1cd711761f mlockall-default-config.patch +dd19d7dfb6b6a846f79693efd4b4d6f3 mlockall-default-config.patch cdefa1dbd95caabbf92198764f18a54e lvm.initd ec36d5fe4561220304e406c5c797e71f lvm.confd 3bec717f7092c1934909962d38038eb3 dmeventd.initd" @@ -105,7 +105,7 @@ sha256sums="45153067fffca74f89a9a4ac95d99e0eebd34ad04252273f19daeedabacd5566 LV 79c5379cbf660f8dabd45359463c77a40b5a83153b54c67ce36049260dac9071 fix-stdio-usage.patch 40d2def3e99c13e3ecbaeb79bb863f42e7ae0e47762ebbc0d025962022a6dc3c mallinfo.patch 303e19a3933c9ad48112dd3c7ae0dfd86e12b88593c7508d745ba2a885286ffb library_dir-default-config.patch -8a490eccf4ea951fea0bbf2921657286f5d92a41cf74ae8ad7d9a8f756b1db9e mlockall-default-config.patch +083bc96cb4f6e81ea11ed925cfdd7e8394048c8a4365a384c6e1a28fa892f5d1 mlockall-default-config.patch 9eea2a296d63794f6200351a625d317e028c0cafcbb6ad6083ea98acc5454e29 lvm.initd e2ff57977ace6098e1a2efc8a1f6796e8bf6e5dd148e4c105bb647ffc6f79230 lvm.confd 05fad3581e8c22ecd81c78aa97fd79b521e622963d519d2d200a06823007d48d dmeventd.initd" @@ -113,7 +113,7 @@ sha512sums="698fadf1a12f6bfc6f8bd9d6499d2cf181e2cf7b9a5105b58cb55168f6104c949aa5 c4d55b366a60926baadf431dd382012eb808490c0bb514e01503d526cfd7ae573efa2d60a92bd5f6f451b54b11fb5cf827f45cec35cfcdee6aa291674cc776dd fix-stdio-usage.patch 9272ec8c5184ef5dc776ead8f74132e072b7563b5119a3a38b712f00d92a1e3878c9b3a54eb2b01dcba038110c686b39d4c17ecd0eb258537e9217d7ed03c408 mallinfo.patch 33004594a5cce7af1e493a2a66ce8ad2f864dde3b2ec0960d0fda9df9b7bcf65d9455f9eccf7860f48726c48f14111b843b0a0c9bd395ef2952b41aaab8092b2 library_dir-default-config.patch -5ba7b2533db0c418f425fc9f97c775d0bb8b79c5bd488eb550a371238e7cc6929043b8196554fdd5b2bf8feab25625f2f27fff7aebae8f2f6ab13c1708474c51 mlockall-default-config.patch +d190c40a137b006d7b63298069c93ff08d2804b990e85d44739cd7c48beec9a569903b98f0d940895fc7365723ba886acd7ef0e08f1f65a1a391d1c448ce080e 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 index 1b7590d74b47..1daadeff3d29 100644 --- a/main/lvm2/mlockall-default-config.patch +++ b/main/lvm2/mlockall-default-config.patch @@ -9,3 +9,16 @@ # Configuration option activation/monitoring. # Monitor LVs that are activated. +diff --git a/lib/config/defaults.h b/lib/config/defaults.h +index 8ab1fde..57b2443 100644 +--- a/lib/config/defaults.h ++++ b/lib/config/defaults.h +@@ -53,7 +53,7 @@ + #define DEFAULT_WAIT_FOR_LOCKS 1 + #define DEFAULT_LVMLOCKD_LOCK_RETRIES 3 + #define DEFAULT_PRIORITISE_WRITE_LOCKS 1 +-#define DEFAULT_USE_MLOCKALL 0 ++#define DEFAULT_USE_MLOCKALL 1 + #define DEFAULT_METADATA_READ_ONLY 0 + #define DEFAULT_LVDISPLAY_SHOWS_FULL_DEVICE_PATH 0 + -- GitLab