fix patch for 2.0.12

This commit is contained in:
Alasdair Kergon 2006-10-16 18:44:06 +00:00
parent 925e3c31c7
commit d3740602d9

View File

@ -1,30 +1,3 @@
--- LVM2.2.02.11-old/lib/locking/locking.c 2006-09-02 02:18:17.000000000 +0100
+++ LVM2.2.02.11/lib/locking/locking.c 2006-10-14 17:30:41.000000000 +0100
@@ -144,18 +144,18 @@ int init_locking(int type, struct cmd_co
case 2:
if (!cmd->is_static) {
log_very_verbose("External locking selected.");
- if (!init_external_locking(&_locking, cmd))
- break;
- return 1;
+ if (init_external_locking(&_locking, cmd))
+ return 1;
}
if (!find_config_tree_int(cmd, "locking/fallback_to_clustered_locking",
DEFAULT_FALLBACK_TO_CLUSTERED_LOCKING))
break;
- log_very_verbose("Falling back to clustered locking.");
- /* Fall through */
#endif
#ifdef CLUSTER_LOCKING_INTERNAL
+ log_very_verbose("Falling back to internal clustered locking.");
+ /* Fall through */
+
case 3:
log_very_verbose("Cluster locking selected.");
if (!init_cluster_locking(&_locking, cmd))
diff -rup LVM2.2.02.11-old/scripts/lvmconf.sh LVM2.2.02.11/scripts/lvmconf.sh
--- LVM2.2.02.11-old/scripts/lvmconf.sh 2006-09-20 18:36:47.000000000 +0100 --- LVM2.2.02.11-old/scripts/lvmconf.sh 2006-09-20 18:36:47.000000000 +0100
+++ LVM2.2.02.11/scripts/lvmconf.sh 2006-10-14 16:57:06.000000000 +0100 +++ LVM2.2.02.11/scripts/lvmconf.sh 2006-10-14 16:57:06.000000000 +0100
@@ -36,7 +36,7 @@ function parse_args @@ -36,7 +36,7 @@ function parse_args