diff options
| author | Zach van Rijn <me@zv.io> | 2021-10-16 01:12:16 +0000 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2021-10-16 01:12:16 +0000 |
| commit | 6ca2ba5c92a7b0679a552725678a40ed5eb4ded5 (patch) | |
| tree | ddc300a108dc4d10ed5ed0188175f54452e8bb0e /system/lvm2/mlockall-default-config.patch | |
| parent | aa90e62ce757fa863685f44ce23f129f56b3225f (diff) | |
| parent | c0f3f757abe6ea39579119b99e9996c4e2bf0e11 (diff) | |
| download | packages-6ca2ba5c92a7b0679a552725678a40ed5eb4ded5.tar.gz packages-6ca2ba5c92a7b0679a552725678a40ed5eb4ded5.tar.bz2 packages-6ca2ba5c92a7b0679a552725678a40ed5eb4ded5.tar.xz packages-6ca2ba5c92a7b0679a552725678a40ed5eb4ded5.zip | |
Merge branch 'master' into 'awilfox/bump/2021-09-system-abipreserve'
# Conflicts:
# system/curl/APKBUILD
Diffstat (limited to 'system/lvm2/mlockall-default-config.patch')
| -rw-r--r-- | system/lvm2/mlockall-default-config.patch | 13 |
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 |