master - dmfilemapd: always terminate link buffer after readlink(2) (coverity)
by Bryn Reeves
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=7db51a6bed8704ec634...
Commit: 7db51a6bed8704ec634b44b4c5bd1dc35fdae86b
Parent: 70bb72667889a2d6f250437e5db247eb111ca1aa
Author: Bryn M. Reeves <bmr(a)redhat.com>
AuthorDate: Wed Mar 29 17:16:34 2017 +0100
Committer: Bryn M. Reeves <bmr(a)redhat.com>
CommitterDate: Wed Mar 29 18:34:05 2017 +0100
dmfilemapd: always terminate link buffer after readlink(2) (coverity)
---
daemons/dmfilemapd/dmfilemapd.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/daemons/dmfilemapd/dmfilemapd.c b/daemons/dmfilemapd/dmfilemapd.c
index 3fd76b7..6e25c5c 100644
--- a/daemons/dmfilemapd/dmfilemapd.c
+++ b/daemons/dmfilemapd/dmfilemapd.c
@@ -593,6 +593,7 @@ check_unlinked:
getpid(), fm->fd);
return 0;
}
+ link_buf[len] = '\0';
/*
* Try to re-open the file, from the path now reported in /proc/pid/fd.
7 years
master - dmfilemapd: always close check file descriptor (coverity)
by Bryn Reeves
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=70bb72667889a2d6f25...
Commit: 70bb72667889a2d6f250437e5db247eb111ca1aa
Parent: 43fdbb8aeb78f9ada5dc135fa421c344c8e998d3
Author: Bryn M. Reeves <bmr(a)redhat.com>
AuthorDate: Wed Mar 29 17:04:55 2017 +0100
Committer: Bryn M. Reeves <bmr(a)redhat.com>
CommitterDate: Wed Mar 29 18:33:53 2017 +0100
dmfilemapd: always close check file descriptor (coverity)
The daemon opens a new file descriptor from fm->path when checking
for an unlinked file with mode=inode. Ensure that it is always
closed even if the same file test fails.
---
daemons/dmfilemapd/dmfilemapd.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/daemons/dmfilemapd/dmfilemapd.c b/daemons/dmfilemapd/dmfilemapd.c
index 0cb0ad7..3fd76b7 100644
--- a/daemons/dmfilemapd/dmfilemapd.c
+++ b/daemons/dmfilemapd/dmfilemapd.c
@@ -566,12 +566,14 @@ static int _filemap_monitor_check_file_unlinked(struct filemap_monitor *fm)
if ((fd = open(fm->path, O_RDONLY)) < 0)
goto check_unlinked;
- if ((same = _filemap_monitor_check_same_file(fm->fd, fd)) < 0)
- return 0;
+ same = _filemap_monitor_check_same_file(fm->fd, fd);
if (close(fd))
log_error("Error closing fd %d", fd);
+ if (same < 0)
+ return 0;
+
if (same)
return 1;
7 years
master - dmfilemapd: use *argv[0] when testing for absolute path (coverity)
by Bryn Reeves
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=43fdbb8aeb78f9ada5d...
Commit: 43fdbb8aeb78f9ada5dc135fa421c344c8e998d3
Parent: b5252a51a5d041a94e712d804a506e94c9a68893
Author: Bryn M. Reeves <bmr(a)redhat.com>
AuthorDate: Wed Mar 29 17:03:20 2017 +0100
Committer: Bryn M. Reeves <bmr(a)redhat.com>
CommitterDate: Wed Mar 29 18:33:42 2017 +0100
dmfilemapd: use *argv[0] when testing for absolute path (coverity)
The path argument check in dmfilemapd incorrectly tests for:
if (argv[0] == '/')
Rather than testing the 1st character in the string pointed to by
argv[0].
---
daemons/dmfilemapd/dmfilemapd.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/daemons/dmfilemapd/dmfilemapd.c b/daemons/dmfilemapd/dmfilemapd.c
index fae6a10..0cb0ad7 100644
--- a/daemons/dmfilemapd/dmfilemapd.c
+++ b/daemons/dmfilemapd/dmfilemapd.c
@@ -305,7 +305,7 @@ static int _parse_args(int argc, char **argv, struct filemap_monitor *fm)
return 0;
}
- if (argv[0] != '/') {
+ if (*argv[0] != '/') {
_early_log("Path argument must specify an absolute path.");
return 0;
}
7 years
master - dmfilemapd: pass correct dirp to closedir()
by Bryn Reeves
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b5252a51a5d041a94e7...
Commit: b5252a51a5d041a94e712d804a506e94c9a68893
Parent: 481a522dd76baaa36b9e903dcd23d66be0b6754a
Author: Bryn M. Reeves <bmr(a)redhat.com>
AuthorDate: Wed Mar 29 16:54:44 2017 +0100
Committer: Bryn M. Reeves <bmr(a)redhat.com>
CommitterDate: Wed Mar 29 16:54:44 2017 +0100
dmfilemapd: pass correct dirp to closedir()
---
daemons/dmfilemapd/dmfilemapd.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/daemons/dmfilemapd/dmfilemapd.c b/daemons/dmfilemapd/dmfilemapd.c
index dec74ec..fae6a10 100644
--- a/daemons/dmfilemapd/dmfilemapd.c
+++ b/daemons/dmfilemapd/dmfilemapd.c
@@ -229,13 +229,13 @@ static int _is_open(const char *path)
if (!pid)
continue;
if (_is_open_in_pid(pid, path)) {
- if (closedir(pid_d))
+ if (closedir(proc_d))
log_sys_error("closedir", DEFAULT_PROC_DIR);
return 1;
}
}
- if (closedir(pid_d))
+ if (closedir(proc_d))
log_sys_error("closedir", DEFAULT_PROC_DIR);
return 0;
7 years
master - dmfilemapd: do not closdir(pid_d) unless it is open
by Bryn Reeves
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=481a522dd76baaa36b9...
Commit: 481a522dd76baaa36b9e903dcd23d66be0b6754a
Parent: d71071a1afe50214f15fa3dd8de0cc207d409147
Author: Bryn M. Reeves <bmr(a)redhat.com>
AuthorDate: Wed Mar 29 16:48:32 2017 +0100
Committer: Bryn M. Reeves <bmr(a)redhat.com>
CommitterDate: Wed Mar 29 16:48:32 2017 +0100
dmfilemapd: do not closdir(pid_d) unless it is open
---
daemons/dmfilemapd/dmfilemapd.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/daemons/dmfilemapd/dmfilemapd.c b/daemons/dmfilemapd/dmfilemapd.c
index 391003e..dec74ec 100644
--- a/daemons/dmfilemapd/dmfilemapd.c
+++ b/daemons/dmfilemapd/dmfilemapd.c
@@ -151,7 +151,7 @@ static int _is_open_in_pid(pid_t pid, const char *path)
if (dm_snprintf(path_buf, sizeof(path_buf),
DEFAULT_PROC_DIR "%d/fd", pid) < 0) {
log_error("Could not format pid path.");
- goto bad;
+ return 0;
}
/*
@@ -160,12 +160,13 @@ static int _is_open_in_pid(pid_t pid, const char *path)
if (dm_snprintf(deleted_path, sizeof(deleted_path), "%s %s",
path, PROC_FD_DELETED_STR) < 0) {
log_error("Could not format check path.");
+ return 0;
}
pid_d = opendir(path_buf);
if (!pid_d) {
log_error("Could not open proc path: %s.", path_buf);
- goto bad;
+ return 0;
}
while ((pid_dp = readdir(pid_d)) != NULL) {
7 years
master - dmfilemapd: log closedir errors with log_sys_error()
by Bryn Reeves
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=d71071a1afe50214f15...
Commit: d71071a1afe50214f15fa3dd8de0cc207d409147
Parent: 5dfd35f2f8ec14398a5d5586b8000e16065bf96f
Author: Bryn M. Reeves <bmr(a)redhat.com>
AuthorDate: Wed Mar 29 16:04:15 2017 +0100
Committer: Bryn M. Reeves <bmr(a)redhat.com>
CommitterDate: Wed Mar 29 16:04:15 2017 +0100
dmfilemapd: log closedir errors with log_sys_error()
---
daemons/dmfilemapd/dmfilemapd.c | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/daemons/dmfilemapd/dmfilemapd.c b/daemons/dmfilemapd/dmfilemapd.c
index 2cd875b..391003e 100644
--- a/daemons/dmfilemapd/dmfilemapd.c
+++ b/daemons/dmfilemapd/dmfilemapd.c
@@ -179,13 +179,16 @@ static int _is_open_in_pid(pid_t pid, const char *path)
}
link_buf[len] = '\0';
if (!strcmp(deleted_path, link_buf)) {
- closedir(pid_d);
+ if (closedir(pid_d))
+ log_sys_error("closedir", path_buf);
return 1;
}
}
bad:
- closedir(pid_d);
+ if (closedir(pid_d))
+ log_sys_error("closedir", path_buf);
+
return 0;
}
@@ -225,11 +228,15 @@ static int _is_open(const char *path)
if (!pid)
continue;
if (_is_open_in_pid(pid, path)) {
- closedir(proc_d);
+ if (closedir(pid_d))
+ log_sys_error("closedir", DEFAULT_PROC_DIR);
return 1;
}
}
- closedir(proc_d);
+
+ if (closedir(pid_d))
+ log_sys_error("closedir", DEFAULT_PROC_DIR);
+
return 0;
}
7 years
master - dmstats: Fix path to static dmstats
by Marian Csontos
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=5dfd35f2f8ec14398a5...
Commit: 5dfd35f2f8ec14398a5d5586b8000e16065bf96f
Parent: 5012be326dbadad811620b1584e46144b3c47722
Author: Marian Csontos <mcsontos(a)redhat.com>
AuthorDate: Wed Mar 29 09:03:57 2017 +0200
Committer: Marian Csontos <mcsontos(a)redhat.com>
CommitterDate: Wed Mar 29 09:04:56 2017 +0200
dmstats: Fix path to static dmstats
---
tools/Makefile.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 3b7b63d..e18c8d7 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -251,7 +251,7 @@ install_dmsetup_dynamic: dmsetup
install_dmsetup_static: dmsetup.static
$(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F)
- $(LN_S) -f $(<F) $(sbindir)/dmstats
+ $(LN_S) -f $(<F) $(staticdir)/dmstats
install_device-mapper: $(INSTALL_DMSETUP_TARGETS)
7 years
master - man: ranges/LV names/symbolic use regexp
by Heinz Mauelshagen
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=5012be326dbadad8116...
Commit: 5012be326dbadad811620b1584e46144b3c47722
Parent: 4af09a94bd44693e5a40a4f895599601d8233d69
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Wed Mar 29 02:27:10 2017 +0200
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Wed Mar 29 02:27:10 2017 +0200
man: ranges/LV names/symbolic use regexp
---
man/Makefile.in | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/man/Makefile.in b/man/Makefile.in
index e357d86..2421116 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -192,7 +192,10 @@ endef
# - multiple (>= 2)
# - in ' -'
# - in (cache|thin)-*
-# - in numerical ranges
+# - in ranges
+# - in "$vg-$lv"
+# - in middle of options (e.g. '--use-policies')
+# - in symbolic use (e.g. '->')
# - in single one in '\\f.-'
define ESCAPEHYPHENS
$(SED) -i -e "s+\([^\\]\)-\{7\}+\1\\\-\\\-\\\-\\\-\\\-\\\-\\\-+g" \
@@ -202,12 +205,16 @@ $(SED) -i -e "s+\([^\\]\)-\{7\}+\1\\\-\\\-\\\-\\\-\\\-\\\-\\\-+g" \
-e "s+\([^\\]\)-\{3\}+\1\\\-\\\-\\\-+g" \
-e "s+\([^\\]\)-\{2\}+\1\\\-\\\-+g" \
-e "s+^-\{2\}+\\\-\\\-+g" \
- -e "s+ -+ \\\-+g" \
+ -e "s+ -\([[:alnum:]]\)+ \\\-\1+g" \
-e "s+\(cache\)-\([[:alpha:]]\{1,\}\)+\1\\\-\2+g" \
-e "s+\(thin\)-\([[:alpha:]]\{1,\}\)+\1\\\-\2+g" \
- -e "s+\([0-9]\)-\([0-9]\)+\1\\\-\2+g" \
+ -e "s+\([ :\[][[:alnum:]]\{1,\}\)-\([[:alnum:]]\{1,\}[[ ]\)+\1\\\-\2+g" \
+ -e "s+\([[:alnum:]]\{2,\}\)-\([[:alnum:]]\{2,\}\)-\([[:alnum:]]\{2,\}\)+\1\\\-\2\\\-\3+g" \
+ -e "s+\([[:alnum:]]\{2,\}\)-\([[:alnum:]]\{2,\}\)+\1\\\-\2+g" \
+ -e "s+\(<\)-+\1\\\-+g" \
+ -e "s+[^\\]-\(>\)+\\\-\1+g" \
-e "s+\(\\\f.\)-\([^-]\)+\1\\\-\2+g" \
- -e "s+\([[:digit:]]\{4\}\)\\\-\([[:digit:]]\{2\}\)\\\-\([[:digit:]]\{2\}\)+\1-\2-\3+g" $@
+ -e "s+\([[:digit:]]\{4\}\).*-\([[:digit:]]\{2\}\).*-\([[:digit:]]\{2\}\)+\1-\2-\3+g" $@
endef
%.5: $(srcdir)/%.5_main
7 years
master - man: simplify by avoiding different headers on de-duplication of lvmconfig, lvm-config and lvm-dumpconfig
by Heinz Mauelshagen
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4af09a94bd44693e5a4...
Commit: 4af09a94bd44693e5a40a4f895599601d8233d69
Parent: 6742137964757356ec25b8daad86d71ea0dbe357
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Wed Mar 29 01:44:09 2017 +0200
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Wed Mar 29 01:44:09 2017 +0200
man: simplify by avoiding different headers on de-duplication of lvmconfig, lvm-config and lvm-dumpconfig
---
man/Makefile.in | 36 ++++++------------------------------
man/lvmconfig.8_des | 2 +-
2 files changed, 7 insertions(+), 31 deletions(-)
diff --git a/man/Makefile.in b/man/Makefile.in
index 105512c..e357d86 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -41,7 +41,7 @@ MAN8=lvm.8 lvmconf.8 lvmdump.8 lvm-fullreport.8 lvm-lvpoll.8 \
vgimport.8 vgimportclone.8 vgmerge.8 vgmknodes.8 vgreduce.8 vgremove.8 \
vgrename.8 vgs.8 vgscan.8 vgsplit.8 \
lvmsar.8 lvmsadc.8 lvmdiskscan.8
-MAN8SO=lvmconfig-common.8 lvmconfig.8.tmp lvm-config.8 lvm-dumpconfig.8
+MAN8SO=lvm-config.8 lvm-dumpconfig.8
MAN8DM=dmsetup.8 dmstats.8
MAN8CLUSTER=
MAN8SYSTEMD_GENERATORS=lvm2-activation-generator.8
@@ -208,17 +208,6 @@ $(SED) -i -e "s+\([^\\]\)-\{7\}+\1\\\-\\\-\\\-\\\-\\\-\\\-\\\-+g" \
-e "s+\([0-9]\)-\([0-9]\)+\1\\\-\2+g" \
-e "s+\(\\\f.\)-\([^-]\)+\1\\\-\2+g" \
-e "s+\([[:digit:]]\{4\}\)\\\-\([[:digit:]]\{2\}\)\\\-\([[:digit:]]\{2\}\)+\1-\2-\3+g" $@
-
-endef
-
-define LVMCONFIGHEADER
- echo ".TH $(1) 8 \"LVM TOOLS #VERSION#\" \"Red Hat, Inc.\"" | $(SED) -e "s+#VERSION#+$(LVM_VERSION)+" > $@
- echo ".SH NAME\n" >> $@
- echo "$(2) \\- Display and manipulate configuration information\n" >> $@
- echo ".\n" >> $@
- echo ".SH SYNOPSIS\n" >> $@
- echo "\\fB$(2)\\fP\n" >> $@
- echo ".so $<" >> $@
endef
%.5: $(srcdir)/%.5_main
@@ -237,21 +226,8 @@ endef
$(SUBSTVARS)
$(ESCAPEHYPHENS)
-# Create lvmconfig-common.8 to be shared by lvmconfig.8, lvm-config.8 and lvm.dumpconfig.8
-lvmconfig-common.8: lvmconfig.8
- $(SED) -e "1,6d" $< > $@
-
-# Create headers for lvmconfig, lvm-config and lvm.dumpconfig and share lvmconfig-common.8
-# Needs temporary target to avoid conflict with %8: target above
-lvmconfig.8.tmp: lvmconfig-common.8
- $(call LVMCONFIGHEADER,LVMCONFIG,lvmconfig)
- mv $@ $(@:%.8.tmp=%.8)
-
-lvm-config.8: lvmconfig-common.8
- $(call LVMCONFIGHEADER,LVM-CONFIG,lvm config)
-
-lvm-dumpconfig.8: lvmconfig-common.8
- $(call LVMCONFIGHEADER,LVM-DUMPCONFIG,lvm dumpconfig)
+lvm-config.8 lvm-dumpconfig.8: lvmconfig.8
+ echo ".so $<" > $@
install_man5: $(MAN5)
$(INSTALL) -d $(MAN5DIR)
@@ -261,9 +237,9 @@ install_man7: $(MAN7)
$(INSTALL) -d $(MAN7DIR)
$(INSTALL_DATA) $(MAN7) $(MAN7DIR)/
-install_man8: $(MAN8) $(MAN8GENERATED)
+install_man8: $(MAN8) $(MAN8SO)
$(INSTALL) -d $(MAN8DIR)
- $(INSTALL_DATA) $(MAN8) $(MAN8GENERATED) $(MAN8DIR)/
+ $(INSTALL_DATA) $(MAN8) $(MAN8SO) $(MAN8DIR)/
install_lvm2: install_man5 install_man7 install_man8
@@ -277,7 +253,7 @@ install_device-mapper: $(MAN8DM)
$(INSTALL) -d $(MAN8DIR)
$(INSTALL_DATA) $(MAN8DM) $(MAN8DIR)/
-install_systemd_generators: $(MAN8SYSTEMD_GENERATORS)
+install_systemdgenerators: $(MAN8SYSTEMD_GENERATORS)
$(INSTALL) -d $(MAN8DIR)
$(INSTALL_DATA) $(MAN8SYSTEMD_GENERATORS) $(MAN8DIR)/
diff --git a/man/lvmconfig.8_des b/man/lvmconfig.8_des
index 2398759..826888d 100644
--- a/man/lvmconfig.8_des
+++ b/man/lvmconfig.8_des
@@ -1,4 +1,4 @@
-lvmconfig, lvm dumpconfig, lvm config produce
+lvmconfig, lvm config, lvm dumpconfig (for compatibility reasons, to be phased out) produce
formatted output from the LVM configuration tree. The
sources of the configuration data include \fBlvm.conf\fP(5) and command
line settings from --config.
7 years
master - man: simplify by avoiding different headers on de-duplication of lvmconfig, lvm-config and lvm-dumpcong
by Heinz Mauelshagen
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=258817a01e0940776e4...
Commit: 258817a01e0940776e45243da97bddef564f0613
Parent: 6742137964757356ec25b8daad86d71ea0dbe357
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Wed Mar 29 01:36:39 2017 +0200
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Wed Mar 29 01:36:39 2017 +0200
man: simplify by avoiding different headers on de-duplication of lvmconfig, lvm-config and lvm-dumpcong
---
man/Makefile.in | 36 ++++++------------------------------
man/lvmconfig.8_des | 2 +-
2 files changed, 7 insertions(+), 31 deletions(-)
diff --git a/man/Makefile.in b/man/Makefile.in
index 105512c..e357d86 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -41,7 +41,7 @@ MAN8=lvm.8 lvmconf.8 lvmdump.8 lvm-fullreport.8 lvm-lvpoll.8 \
vgimport.8 vgimportclone.8 vgmerge.8 vgmknodes.8 vgreduce.8 vgremove.8 \
vgrename.8 vgs.8 vgscan.8 vgsplit.8 \
lvmsar.8 lvmsadc.8 lvmdiskscan.8
-MAN8SO=lvmconfig-common.8 lvmconfig.8.tmp lvm-config.8 lvm-dumpconfig.8
+MAN8SO=lvm-config.8 lvm-dumpconfig.8
MAN8DM=dmsetup.8 dmstats.8
MAN8CLUSTER=
MAN8SYSTEMD_GENERATORS=lvm2-activation-generator.8
@@ -208,17 +208,6 @@ $(SED) -i -e "s+\([^\\]\)-\{7\}+\1\\\-\\\-\\\-\\\-\\\-\\\-\\\-+g" \
-e "s+\([0-9]\)-\([0-9]\)+\1\\\-\2+g" \
-e "s+\(\\\f.\)-\([^-]\)+\1\\\-\2+g" \
-e "s+\([[:digit:]]\{4\}\)\\\-\([[:digit:]]\{2\}\)\\\-\([[:digit:]]\{2\}\)+\1-\2-\3+g" $@
-
-endef
-
-define LVMCONFIGHEADER
- echo ".TH $(1) 8 \"LVM TOOLS #VERSION#\" \"Red Hat, Inc.\"" | $(SED) -e "s+#VERSION#+$(LVM_VERSION)+" > $@
- echo ".SH NAME\n" >> $@
- echo "$(2) \\- Display and manipulate configuration information\n" >> $@
- echo ".\n" >> $@
- echo ".SH SYNOPSIS\n" >> $@
- echo "\\fB$(2)\\fP\n" >> $@
- echo ".so $<" >> $@
endef
%.5: $(srcdir)/%.5_main
@@ -237,21 +226,8 @@ endef
$(SUBSTVARS)
$(ESCAPEHYPHENS)
-# Create lvmconfig-common.8 to be shared by lvmconfig.8, lvm-config.8 and lvm.dumpconfig.8
-lvmconfig-common.8: lvmconfig.8
- $(SED) -e "1,6d" $< > $@
-
-# Create headers for lvmconfig, lvm-config and lvm.dumpconfig and share lvmconfig-common.8
-# Needs temporary target to avoid conflict with %8: target above
-lvmconfig.8.tmp: lvmconfig-common.8
- $(call LVMCONFIGHEADER,LVMCONFIG,lvmconfig)
- mv $@ $(@:%.8.tmp=%.8)
-
-lvm-config.8: lvmconfig-common.8
- $(call LVMCONFIGHEADER,LVM-CONFIG,lvm config)
-
-lvm-dumpconfig.8: lvmconfig-common.8
- $(call LVMCONFIGHEADER,LVM-DUMPCONFIG,lvm dumpconfig)
+lvm-config.8 lvm-dumpconfig.8: lvmconfig.8
+ echo ".so $<" > $@
install_man5: $(MAN5)
$(INSTALL) -d $(MAN5DIR)
@@ -261,9 +237,9 @@ install_man7: $(MAN7)
$(INSTALL) -d $(MAN7DIR)
$(INSTALL_DATA) $(MAN7) $(MAN7DIR)/
-install_man8: $(MAN8) $(MAN8GENERATED)
+install_man8: $(MAN8) $(MAN8SO)
$(INSTALL) -d $(MAN8DIR)
- $(INSTALL_DATA) $(MAN8) $(MAN8GENERATED) $(MAN8DIR)/
+ $(INSTALL_DATA) $(MAN8) $(MAN8SO) $(MAN8DIR)/
install_lvm2: install_man5 install_man7 install_man8
@@ -277,7 +253,7 @@ install_device-mapper: $(MAN8DM)
$(INSTALL) -d $(MAN8DIR)
$(INSTALL_DATA) $(MAN8DM) $(MAN8DIR)/
-install_systemd_generators: $(MAN8SYSTEMD_GENERATORS)
+install_systemdgenerators: $(MAN8SYSTEMD_GENERATORS)
$(INSTALL) -d $(MAN8DIR)
$(INSTALL_DATA) $(MAN8SYSTEMD_GENERATORS) $(MAN8DIR)/
diff --git a/man/lvmconfig.8_des b/man/lvmconfig.8_des
index 2398759..826888d 100644
--- a/man/lvmconfig.8_des
+++ b/man/lvmconfig.8_des
@@ -1,4 +1,4 @@
-lvmconfig, lvm dumpconfig, lvm config produce
+lvmconfig, lvm config, lvm dumpconfig (for compatibility reasons, to be phased out) produce
formatted output from the LVM configuration tree. The
sources of the configuration data include \fBlvm.conf\fP(5) and command
line settings from --config.
7 years