259 lines
8.3 KiB
Plaintext
259 lines
8.3 KiB
Plaintext
diff -cr src/conf/example.conf.in src-mod/conf/example.conf.in
|
|
*** src/conf/example.conf.in Fri May 8 04:31:44 2020
|
|
--- src-mod/conf/example.conf.in Fri May 8 04:34:25 2020
|
|
***************
|
|
*** 937,942 ****
|
|
--- 937,943 ----
|
|
# Configuration option global/library_dir.
|
|
# Search this directory first for shared libraries.
|
|
# This configuration option does not have a default value defined.
|
|
+ library_dir="/lib/device-mapper"
|
|
|
|
# Configuration option global/abort_on_internal_errors.
|
|
# Abort a command that encounters an internal error.
|
|
***************
|
|
*** 1618,1624 ****
|
|
# 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
|
|
|
|
# Configuration option activation/monitoring.
|
|
# Monitor LVs that are activated.
|
|
--- 1619,1625 ----
|
|
# 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 = 1
|
|
|
|
# Configuration option activation/monitoring.
|
|
# Monitor LVs that are activated.
|
|
diff -cr src/lib/commands/toolcontext.c src-mod/lib/commands/toolcontext.c
|
|
*** src/lib/commands/toolcontext.c Fri May 8 04:32:31 2020
|
|
--- src-mod/lib/commands/toolcontext.c Fri May 8 04:28:30 2020
|
|
***************
|
|
*** 1599,1605 ****
|
|
/* FIXME Make this configurable? */
|
|
reset_lvm_errno(1);
|
|
|
|
! #ifndef VALGRIND_POOL
|
|
/* Set in/out stream buffering before glibc */
|
|
if (set_buffering
|
|
#ifdef SYS_gettid
|
|
--- 1599,1605 ----
|
|
/* FIXME Make this configurable? */
|
|
reset_lvm_errno(1);
|
|
|
|
! #if !defined(VALGRIND_POOL) && defined(__GLIBC__)
|
|
/* Set in/out stream buffering before glibc */
|
|
if (set_buffering
|
|
#ifdef SYS_gettid
|
|
***************
|
|
*** 1980,1986 ****
|
|
|
|
if (cmd->pending_delete_mem)
|
|
dm_pool_destroy(cmd->pending_delete_mem);
|
|
! #ifndef VALGRIND_POOL
|
|
if (cmd->linebuffer) {
|
|
/* Reset stream buffering to defaults */
|
|
if (is_valid_fd(STDIN_FILENO) &&
|
|
--- 1980,1986 ----
|
|
|
|
if (cmd->pending_delete_mem)
|
|
dm_pool_destroy(cmd->pending_delete_mem);
|
|
! #if !defined(VALGRIND_POOL) && defined(__GLIBC__)
|
|
if (cmd->linebuffer) {
|
|
/* Reset stream buffering to defaults */
|
|
if (is_valid_fd(STDIN_FILENO) &&
|
|
diff -cr src/lib/config/defaults.h src-mod/lib/config/defaults.h
|
|
*** src/lib/config/defaults.h Fri May 8 04:32:14 2020
|
|
--- src-mod/lib/config/defaults.h Fri May 8 04:28:02 2020
|
|
***************
|
|
*** 66,72 ****
|
|
#define DEFAULT_LVMLOCKD_LOCK_RETRIES 3
|
|
#define DEFAULT_LVMETAD_UPDATE_WAIT_TIME 10
|
|
#define DEFAULT_PRIORITISE_WRITE_LOCKS 1
|
|
! #define DEFAULT_USE_MLOCKALL 0
|
|
#define DEFAULT_METADATA_READ_ONLY 0
|
|
#define DEFAULT_LVDISPLAY_SHOWS_FULL_DEVICE_PATH 0
|
|
#define DEFAULT_UNKNOWN_DEVICE_NAME "[unknown]"
|
|
--- 66,72 ----
|
|
#define DEFAULT_LVMLOCKD_LOCK_RETRIES 3
|
|
#define DEFAULT_LVMETAD_UPDATE_WAIT_TIME 10
|
|
#define DEFAULT_PRIORITISE_WRITE_LOCKS 1
|
|
! #define DEFAULT_USE_MLOCKALL 1
|
|
#define DEFAULT_METADATA_READ_ONLY 0
|
|
#define DEFAULT_LVDISPLAY_SHOWS_FULL_DEVICE_PATH 0
|
|
#define DEFAULT_UNKNOWN_DEVICE_NAME "[unknown]"
|
|
diff -cr src/lib/mm/memlock.c src-mod/lib/mm/memlock.c
|
|
*** src/lib/mm/memlock.c Fri May 8 04:32:45 2020
|
|
--- src-mod/lib/mm/memlock.c Fri May 8 04:25:32 2020
|
|
***************
|
|
*** 159,165 ****
|
|
|
|
static void _allocate_memory(void)
|
|
{
|
|
! #ifndef VALGRIND_POOL
|
|
void *stack_mem;
|
|
struct rlimit limit;
|
|
int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks;
|
|
--- 159,165 ----
|
|
|
|
static void _allocate_memory(void)
|
|
{
|
|
! #if !defined(VALGRIND_POOL) && defined(__GLIBC__)
|
|
void *stack_mem;
|
|
struct rlimit limit;
|
|
int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks;
|
|
diff -cr src/tools/lvmcmdline.c src-mod/tools/lvmcmdline.c
|
|
*** src/tools/lvmcmdline.c Fri May 8 04:31:34 2020
|
|
--- src-mod/tools/lvmcmdline.c Fri May 8 04:28:18 2020
|
|
***************
|
|
*** 3233,3239 ****
|
|
int err = is_valid_fd(STDERR_FILENO);
|
|
|
|
if (!is_valid_fd(STDIN_FILENO) &&
|
|
! !(stdin = fopen(_PATH_DEVNULL, "r"))) {
|
|
if (err)
|
|
perror("stdin stream open");
|
|
else
|
|
--- 3233,3239 ----
|
|
int err = is_valid_fd(STDERR_FILENO);
|
|
|
|
if (!is_valid_fd(STDIN_FILENO) &&
|
|
! !freopen(_PATH_DEVNULL, "r", stdin)) {
|
|
if (err)
|
|
perror("stdin stream open");
|
|
else
|
|
***************
|
|
*** 3243,3249 ****
|
|
}
|
|
|
|
if (!is_valid_fd(STDOUT_FILENO) &&
|
|
! !(stdout = fopen(_PATH_DEVNULL, "w"))) {
|
|
if (err)
|
|
perror("stdout stream open");
|
|
/* else no stdout */
|
|
--- 3243,3249 ----
|
|
}
|
|
|
|
if (!is_valid_fd(STDOUT_FILENO) &&
|
|
! !freopen(_PATH_DEVNULL, "w", stdout)) {
|
|
if (err)
|
|
perror("stdout stream open");
|
|
/* else no stdout */
|
|
***************
|
|
*** 3251,3257 ****
|
|
}
|
|
|
|
if (!is_valid_fd(STDERR_FILENO) &&
|
|
! !(stderr = fopen(_PATH_DEVNULL, "w"))) {
|
|
printf("stderr stream open: %s\n",
|
|
strerror(errno));
|
|
return 0;
|
|
--- 3251,3257 ----
|
|
}
|
|
|
|
if (!is_valid_fd(STDERR_FILENO) &&
|
|
! !freopen(_PATH_DEVNULL, "w", stderr)) {
|
|
printf("stderr stream open: %s\n",
|
|
strerror(errno));
|
|
return 0;
|
|
diff -cr src/make.tmpl.in src-mod/make.tmpl.in
|
|
*** src/make.tmpl.in Sat May 9 03:00:59 2020
|
|
--- src-mod/make.tmpl.in Sat May 9 03:00:49 2020
|
|
***************
|
|
*** 162,174 ****
|
|
M_INSTALL_DATA = -m 444
|
|
endif
|
|
INSTALL_PROGRAM = $(INSTALL) $(M_INSTALL_PROGRAM) $(STRIP)
|
|
! INSTALL_DATA = $(INSTALL) -p $(M_INSTALL_DATA)
|
|
! INSTALL_WDATA = $(INSTALL) -p -m 644
|
|
|
|
INSTALL_DIR = $(INSTALL) -m 755 -d
|
|
INSTALL_ROOT_DIR = $(INSTALL) -m 700 -d
|
|
INSTALL_ROOT_DATA = $(INSTALL) -m 600
|
|
! INSTALL_SCRIPT = $(INSTALL) -p $(M_INSTALL_PROGRAM)
|
|
|
|
.SUFFIXES:
|
|
.SUFFIXES: .c .cpp .d .o .so .a .po .pot .mo .dylib
|
|
--- 162,174 ----
|
|
M_INSTALL_DATA = -m 444
|
|
endif
|
|
INSTALL_PROGRAM = $(INSTALL) $(M_INSTALL_PROGRAM) $(STRIP)
|
|
! INSTALL_DATA = $(INSTALL) $(M_INSTALL_DATA)
|
|
! INSTALL_WDATA = $(INSTALL) -m 644
|
|
|
|
INSTALL_DIR = $(INSTALL) -m 755 -d
|
|
INSTALL_ROOT_DIR = $(INSTALL) -m 700 -d
|
|
INSTALL_ROOT_DATA = $(INSTALL) -m 600
|
|
! INSTALL_SCRIPT = $(INSTALL) $(M_INSTALL_PROGRAM)
|
|
|
|
.SUFFIXES:
|
|
.SUFFIXES: .c .cpp .d .o .so .a .po .pot .mo .dylib
|
|
***************
|
|
*** 508,514 ****
|
|
$(CC) -MM $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) -o $@ $<; \
|
|
sed -i "s/\(.*\)\.o[ :]*/$$FILE.o $$FILE.d $$FILE.pot: $$DEPS /g" $@; \
|
|
DEPLIST=`sed 's/ \\\\//;s/.*://;' < $@`; \
|
|
! echo $$DEPLIST | fmt -1 | sed 's/ //g;s/\(.*\)/\1:/' >> $@; \
|
|
[ -s $@ ] || $(RM) $@
|
|
|
|
%.mo: %.po
|
|
--- 508,514 ----
|
|
$(CC) -MM $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) -o $@ $<; \
|
|
sed -i "s/\(.*\)\.o[ :]*/$$FILE.o $$FILE.d $$FILE.pot: $$DEPS /g" $@; \
|
|
DEPLIST=`sed 's/ \\\\//;s/.*://;' < $@`; \
|
|
! echo $$DEPLIST | tr -s '[:blank:]' '\n' | sed 's/ //g;s/\(.*\)/\1:/' >> $@; \
|
|
[ -s $@ ] || $(RM) $@
|
|
|
|
%.mo: %.po
|
|
*** src/libdm/make.tmpl.in Thu Mar 26 11:26:37 2020
|
|
--- src-mod/libdm/make.tmpl.in Sat May 9 03:29:23 2020
|
|
***************
|
|
*** 156,168 ****
|
|
M_INSTALL_DATA = -m 444
|
|
endif
|
|
INSTALL_PROGRAM = $(INSTALL) $(M_INSTALL_PROGRAM) $(STRIP)
|
|
! INSTALL_DATA = $(INSTALL) -p $(M_INSTALL_DATA)
|
|
! INSTALL_WDATA = $(INSTALL) -p -m 644
|
|
|
|
INSTALL_DIR = $(INSTALL) -m 755 -d
|
|
INSTALL_ROOT_DIR = $(INSTALL) -m 700 -d
|
|
INSTALL_ROOT_DATA = $(INSTALL) -m 600
|
|
! INSTALL_SCRIPT = $(INSTALL) -p $(M_INSTALL_PROGRAM)
|
|
|
|
.SUFFIXES:
|
|
.SUFFIXES: .c .cpp .d .o .so .a .po .pot .mo .dylib
|
|
--- 156,168 ----
|
|
M_INSTALL_DATA = -m 444
|
|
endif
|
|
INSTALL_PROGRAM = $(INSTALL) $(M_INSTALL_PROGRAM) $(STRIP)
|
|
! INSTALL_DATA = $(INSTALL) $(M_INSTALL_DATA)
|
|
! INSTALL_WDATA = $(INSTALL) -m 644
|
|
|
|
INSTALL_DIR = $(INSTALL) -m 755 -d
|
|
INSTALL_ROOT_DIR = $(INSTALL) -m 700 -d
|
|
INSTALL_ROOT_DATA = $(INSTALL) -m 600
|
|
! INSTALL_SCRIPT = $(INSTALL) $(M_INSTALL_PROGRAM)
|
|
|
|
.SUFFIXES:
|
|
.SUFFIXES: .c .cpp .d .o .so .a .po .pot .mo .dylib
|
|
***************
|
|
*** 469,475 ****
|
|
$(CC) -MM $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) -o $@ $<; \
|
|
sed -i "s/\(.*\)\.o[ :]*/$$FILE.o $$FILE.d $$FILE.pot: $$DEPS /g" $@; \
|
|
DEPLIST=`sed 's/ \\\\//;s/.*://;' < $@`; \
|
|
! echo $$DEPLIST | fmt -1 | sed 's/ //g;s/\(.*\)/\1:/' >> $@; \
|
|
[ -s $@ ] || $(RM) $@
|
|
|
|
%.mo: %.po
|
|
--- 469,475 ----
|
|
$(CC) -MM $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) -o $@ $<; \
|
|
sed -i "s/\(.*\)\.o[ :]*/$$FILE.o $$FILE.d $$FILE.pot: $$DEPS /g" $@; \
|
|
DEPLIST=`sed 's/ \\\\//;s/.*://;' < $@`; \
|
|
! echo $$DEPLIST | tr -s '[:blank:]' '\n' | sed 's/ //g;s/\(.*\)/\1:/' >> $@; \
|
|
[ -s $@ ] || $(RM) $@
|
|
|
|
%.mo: %.po
|