Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=64086c3bd827c3f2…
Commit: 64086c3bd827c3f276886125711b112e87bcfd03
Parent: 31b1d06dddbab131f85909315dcd1e2d3d6c4562
Author: Peter Rajnoha <prajnoha(a)redhat.com>
AuthorDate: Tue Mar 18 08:28:58 2014 +0100
Committer: Peter Rajnoha <prajnoha(a)redhat.com>
CommitterDate: Tue Mar 18 08:28:58 2014 +0100
doc: cleanup/extend some man pages/conf comments
man/lvm2-activation-generator.8:
Generator Specification -> Generators Specification
(this is the exact word in the systemd man page)
conf/example.conf.in:
cleanup recent edits related to report section
man/lvm.conf.5:
add a line about a possibility to generate a new
profile with lvm dumpconfig command as an alternative
to copying the default profile
---
conf/example.conf.in | 6 +++---
man/lvm.conf.5.in | 18 ++++++++++++------
man/lvm2-activation-generator.8.in | 2 +-
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/conf/example.conf.in b/conf/example.conf.in
index 46ae461..f54ab8d 100644
--- a/conf/example.conf.in
+++ b/conf/example.conf.in
@@ -978,15 +978,15 @@ activation {
polling_interval = 15
}
-# Reporting settings.
+# Report settings.
#
# report {
# Align columns on report output.
# aligned=1
# When buffered reporting is used, the report's content is appended
- # incrementally for each object being reported until the report is
- # flushed to output which normally happens at the end of command
+ # incrementally to include each object being reported until the report
+ # is flushed to output which normally happens at the end of command
# execution. Otherwise, if buffering is not used, each object is
# reported as soon as its processing is finished.
# buffered=1
diff --git a/man/lvm.conf.5.in b/man/lvm.conf.5.in
index 73fcf47..099c5a7 100644
--- a/man/lvm.conf.5.in
+++ b/man/lvm.conf.5.in
@@ -23,12 +23,18 @@ See \fBtags\fP configuration setting description below.
A profile is a set of selected customizable configuration settings
that are aimed to achieve a certain characteristics in various
environments or uses. Normally, the name of the profile should
-reflect that environment or use. LVM itself provides a few predefined
-configuration profiles. Users are allowed to add more profiles
-with different values if needed. For this purpose, there's the \fBdefault.profile\fP
-which contains all settings that are customizable by profiles
-and users are encouraged to copy this profile, then to change the values
-as needed and to remove the settings that are not customized by the new profile.
+reflect that environment or use.
+
+LVM itself provides a few predefined configuration profiles.
+Users are allowed to add more profiles with different values if needed.
+For this purpose, there's the \fBdefault.profile\fP which contains all
+settings that are customizable by profiles. Users are encouraged
+to copy this default profile and edit it as needed. Alternatively,
+the \fBlvm dumpconfig --file <ProfileName.profile> --type profilable <section>\fP
+can be used to generate a configuration with profilable settings for
+given section and save it to new ProfileName.profile (if the section
+is not specified, all profilable settings are reported).
+
The profiles are stored in #DEFAULT_PROFILE_DIR# directory by default.
This location can be changed using the \fBconfig/profile_dir\fP setting.
Each profile configuration is stored in \fBProfileName.profile\fP file
diff --git a/man/lvm2-activation-generator.8.in b/man/lvm2-activation-generator.8.in
index bd47397..180b8da 100644
--- a/man/lvm2-activation-generator.8.in
+++ b/man/lvm2-activation-generator.8.in
@@ -40,7 +40,7 @@ since such LVM volumes are activated automatically as soon as the Volume Group
is ready (all the Physical Volumes making up the Volume Group are present
in the system).
-The lvm2-activation-generator implements the \fBGenerator Specification\fP
+The lvm2-activation-generator implements the \fBGenerators Specification\fP
as referenced in \fBsystemd\fP(1).
.sp
.SH SEE ALSO
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=ae2d80dd7e3379e6…
Commit: ae2d80dd7e3379e62be610e56114ebba02a0eac2
Parent: e398901ed1d77684155a52c464f6265f68a96562
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Mar 17 15:18:02 2014 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Mar 17 15:18:02 2014 +0100
tests: update error message check
---
test/shell/lvcreate-small-snap.sh | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/test/shell/lvcreate-small-snap.sh b/test/shell/lvcreate-small-snap.sh
index e0e6d1a..33532db 100644
--- a/test/shell/lvcreate-small-snap.sh
+++ b/test/shell/lvcreate-small-snap.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2010-2013 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2010-2014 Red Hat, Inc. All rights reserved.
#
# This copyrighted material is made available to anyone wishing to use,
# modify, copy, or redistribute it subject to the terms and conditions
@@ -24,8 +24,8 @@ lvcreate -s -c 8k -l 24 -n snapX2 $vg/one
# Check that snapshots that are too small are caught with correct error.
not lvcreate -s -c 8k -l 8 -n snapX3 $vg/one 2>&1 | tee lvcreate.out
not grep "suspend origin one" lvcreate.out
-grep "Unable to create a snapshot" lvcreate.out
+grep "smaller" lvcreate.out
not lvcreate -s -l 4 -n snapB $vg/one 2>&1 | tee lvcreate.out
not grep "suspend origin one" lvcreate.out
-grep "Unable to create a snapshot" lvcreate.out
+grep "smaller" lvcreate.out
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=e398901ed1d77684…
Commit: e398901ed1d77684155a52c464f6265f68a96562
Parent: fe8603dd609cb99f6a86b0345b6d0733aa1b5d1d
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Mar 17 13:16:17 2014 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Mar 17 14:31:45 2014 +0100
tests: zero and error type tests
---
test/shell/error-usage.sh | 33 +++++++++++++++++++++++++++++++++
test/shell/zero-usage.sh | 34 ++++++++++++++++++++++++++++++++++
2 files changed, 67 insertions(+), 0 deletions(-)
diff --git a/test/shell/error-usage.sh b/test/shell/error-usage.sh
new file mode 100644
index 0000000..a7e3593
--- /dev/null
+++ b/test/shell/error-usage.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+# Copyright (C) 2014 Red Hat, Inc. All rights reserved.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions
+# of the GNU General Public License v.2.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+# Basic usage of zero target
+
+. lib/test
+
+which md5sum || skip
+
+aux prepare_pvs 1
+
+vgcreate -s 256k $vg $(cat DEVICES)
+
+lvcreate --type error -L1 -n $lv1 $vg
+lvextend -L+1 $vg/$lv1
+
+# has to match
+
+check lv_field $vg/$lv1 lv_modules "error"
+check lv_field $vg/$lv1 segtype "error"
+check lv_field $vg/$lv1 seg_count "1"
+check lv_field $vg/$lv1 seg_size_pe "8" # 8 * 256
+
+# FIXME should we print info we are ignoring stripping?
+lvextend -L+1 -I64 -i2 $vg/$lv1
diff --git a/test/shell/zero-usage.sh b/test/shell/zero-usage.sh
new file mode 100644
index 0000000..b140558
--- /dev/null
+++ b/test/shell/zero-usage.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+# Copyright (C) 2014 Red Hat, Inc. All rights reserved.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions
+# of the GNU General Public License v.2.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+# Basic usage of zero target
+
+. lib/test
+
+which md5sum || skip
+
+aux prepare_pvs 1
+
+vgcreate -s 256k $vg $(cat DEVICES)
+
+lvcreate --type zero -L1 -n $lv1 $vg
+lvextend -L+1 $vg/$lv1
+
+sum1=$(dd if=/dev/zero bs=2M count=1 | md5sum | cut -f1 -d' ')
+sum2=$(dd if="$DM_DEV_DIR/$vg/$lv1" bs=2M count=1 | md5sum | cut -f1 -d' ')
+
+# has to match
+test "$sum1" = "$sum2"
+
+check lv_field $vg/$lv1 lv_modules "zero"
+check lv_field $vg/$lv1 segtype "zero"
+check lv_field $vg/$lv1 seg_count "1"
+check lv_field $vg/$lv1 seg_size_pe "8" # 8 * 256