35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
|
From 0c4304ca8b3328132537922fed8ee9e3bbb8a0fa Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lukasz Dorau <lukasz.dorau@intel.com>
|
||
|
|
Date: Thu, 12 Jan 2012 10:57:20 +1100
|
||
|
|
Subject: [PATCH] fix: container creation with --incremental used.
|
||
|
|
|
||
|
|
If there is no name provided for a container by the metadata it is
|
||
|
|
always appropriate to use the metadata version name. create_mddev
|
||
|
|
will still add a uniquifying digit to the end so there is little risk
|
||
|
|
of confusion.
|
||
|
|
This makes the --incremental code behave the same as the --assemble code.
|
||
|
|
|
||
|
|
Signed-off-by: Lukasz Dorau <lukasz.dorau@intel.com>
|
||
|
|
Signed-off-by: NeilBrown <neilb@suse.de>
|
||
|
|
---
|
||
|
|
Incremental.c | 3 +--
|
||
|
|
1 files changed, 1 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Incremental.c b/Incremental.c
|
||
|
|
index 78c9712..60175af 100644
|
||
|
|
--- a/Incremental.c
|
||
|
|
+++ b/Incremental.c
|
||
|
|
@@ -259,8 +259,7 @@ int Incremental(char *devname, int verbose, int runstop,
|
||
|
|
|
||
|
|
name_to_use = info.name;
|
||
|
|
if (name_to_use[0] == 0 &&
|
||
|
|
- info.array.level == LEVEL_CONTAINER &&
|
||
|
|
- trustworthy == LOCAL) {
|
||
|
|
+ info.array.level == LEVEL_CONTAINER) {
|
||
|
|
name_to_use = info.text_version;
|
||
|
|
trustworthy = METADATA;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
1.7.7.6
|
||
|
|
|