summaryrefslogtreecommitdiff
path: root/system/lvm2/mlockall-default-config.patch
diff options
context:
space:
mode:
authorZach van Rijn <me@zv.io>2021-10-06 19:26:47 +0000
committerZach van Rijn <me@zv.io>2021-10-06 19:26:47 +0000
commit6fcbae3509457bab336ba5b5606a2bad5664fcec (patch)
tree9fb3e968f02bc98cdf8fe7839ccc2ed7b016b34e /system/lvm2/mlockall-default-config.patch
parent7d36f2cfd6cb77d3e68194b6f523e06dd9bebe41 (diff)
parent25d58ab44b91071965480d1a3dbd1acba741e061 (diff)
downloadpackages-6fcbae3509457bab336ba5b5606a2bad5664fcec.tar.gz
packages-6fcbae3509457bab336ba5b5606a2bad5664fcec.tar.bz2
packages-6fcbae3509457bab336ba5b5606a2bad5664fcec.tar.xz
packages-6fcbae3509457bab336ba5b5606a2bad5664fcec.zip
Merge branch 'bump.djt.20210930' into 'master'
Package Bumps for all packages maintained by djt See merge request adelie/packages!629
Diffstat (limited to 'system/lvm2/mlockall-default-config.patch')
-rw-r--r--system/lvm2/mlockall-default-config.patch13
1 files changed, 6 insertions, 7 deletions
diff --git a/system/lvm2/mlockall-default-config.patch b/system/lvm2/mlockall-default-config.patch
index 1daadeff3..898611ec7 100644
--- a/system/lvm2/mlockall-default-config.patch
+++ b/system/lvm2/mlockall-default-config.patch
@@ -1,15 +1,14 @@
---- ./conf/example.conf.in.orig
-+++ ./conf/example.conf.in
-@@ -1352,7 +1352,7 @@
- # Use the old behavior of mlockall to pin all memory.
+--- ./conf/example.conf.in.old 2021-10-04 09:59:13.191167497 +0000
++++ ./conf/example.conf.in 2021-10-04 09:59:41.718184441 +0000
+@@ -1696,7 +1696,7 @@
# Prior to version 2.02.62, LVM used mlockall() to pin the whole
# process's memory while activating devices.
-- use_mlockall = 0
+ # This configuration option has an automatic default value.
+- # use_mlockall = 0
+ use_mlockall = 1
# Configuration option activation/monitoring.
- # Monitor LVs that are activated.
-diff --git a/lib/config/defaults.h b/lib/config/defaults.h
+ # 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