tb/contrib
1
0
Fork 0
forked from ports/contrib
Code Pull Requests Activity

lvm2: 2.02.41 -> 2.02.42

Browse Source
This commit is contained in:
Danny Rawlins 2008-10-27 22:50:33 +11:00
parent 1fbdb8ee21
commit 8e7b98bdd7
4 changed files with 4 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lvm2/.md5sum
View File

@ -1,3 +1 @@
e5b1927825ea2ef4a270606e881d9c88 LVM2.2.02.41.tgz
7605c4380c33836ab1a13250a02a2870 lvm2-2.02.41_global-locking-conf.patch
4e831566d153ece89684b0c5fa874d65 lvm2-2.02.41_lv-mirror.patch
1044f9646abe417108ffdf0c69ac0d8d LVM2.2.02.42.tgz

12
lvm2/Pkgfile
View File

@ -5,18 +5,12 @@
# Depends on: libdevmapper
name=lvm2
version=2.02.41
release=3
source=(ftp://sources.redhat.com/pub/lvm2/LVM2.$version.tgz
lvm2-2.02.41_lv-mirror.patch
lvm2-2.02.41_global-locking-conf.patch)
version=2.02.42
release=1
source=(ftp://sources.redhat.com/pub/lvm2/LVM2.$version.tgz)
build() {
cd LVM2.$version
patch -p 1 -i $SRC/lvm2-2.02.41_lv-mirror.patch
patch -p 1 -i $SRC/lvm2-2.02.41_global-locking-conf.patch
./configure \
--prefix=/usr \
--exec-prefix= \

22
lvm2/lvm2-2.02.41_global-locking-conf.patch
View File

@ -1,22 +0,0 @@
--- LVM2/lib/locking/locking.c 2008/09/10 10:14:59 1.50
+++ LVM2/lib/locking/locking.c 2008/10/24 01:16:16 1.51
@@ -233,7 +233,8 @@
return 1;
}
if (!find_config_tree_int(cmd, "locking/fallback_to_clustered_locking",
- DEFAULT_FALLBACK_TO_CLUSTERED_LOCKING))
+ find_config_tree_int(cmd, "global/fallback_to_clustered_locking",
+ DEFAULT_FALLBACK_TO_CLUSTERED_LOCKING)))
break;
#endif
@@ -255,7 +256,8 @@
if ((type == 2 || type == 3) &&
find_config_tree_int(cmd, "locking/fallback_to_local_locking",
- DEFAULT_FALLBACK_TO_LOCAL_LOCKING)) {
+ find_config_tree_int(cmd, "global/fallback_to_local_locking",
+ DEFAULT_FALLBACK_TO_LOCAL_LOCKING))) {
log_warn("WARNING: Falling back to local file-based locking.");
log_warn("Volume Groups with the clustered attribute will "
"be inaccessible.");

40
lvm2/lvm2-2.02.41_lv-mirror.patch
View File

@ -1,40 +0,0 @@
--- LVM2/lib/metadata/lv_manip.c 2008/10/17 10:57:15 1.157
+++ LVM2/lib/metadata/lv_manip.c 2008/10/23 11:21:04 1.158
@@ -2380,30 +2380,29 @@
return NULL;
}
- if (strstr(name, "_mimagetmp")) {
- log_very_verbose("Creating transient 'zero' LV"
- " for Mirror -> mirror up-convert.");
+ if (lv_is_active(lv_where) && strstr(name, "_mimagetmp")) {
+ log_very_verbose("Creating transient LV %s for mirror conversion in VG %s.", name, lv_where->vg->name);
- segtype = get_segtype_from_string(cmd, "zero");
+ segtype = get_segtype_from_string(cmd, "error");
if (!lv_add_virtual_segment(layer_lv, 0, lv_where->le_count, segtype)) {
- log_error("Creation of intermediate layer LV failed.");
+ log_error("Creation of transient LV %s for mirror conversion in VG %s failed.", name, lv_where->vg->name);
return NULL;
}
if (!vg_write(lv_where->vg)) {
- log_error("Failed to write intermediate VG metadata");
+ log_error("Failed to write intermediate VG %s metadata for mirror conversion.", lv_where->vg->name);
return NULL;
}
if (!vg_commit(lv_where->vg)) {
- log_error("Failed to commit intermediate VG metadata");
+ log_error("Failed to commit intermediate VG %s metadata for mirror conversion.", lv_where->vg->name);
vg_revert(lv_where->vg);
return NULL;
}
if (!activate_lv(cmd, layer_lv)) {
- log_error("Failed to resume intermediate 'zero' LV, %s", name);
+ log_error("Failed to resume transient error LV %s for mirror conversion in VG %s.", name, lv_where->vg->name);
return NULL;
}
}