o pvcreate --uuid to specify the uuid (required before using vgcfgrestore

  onto a new device).  uuid specified must not already exist on the system.
o More message tidying.
o When checking for label, only read PV metadata.
o Add ataraid.  [Needs moving into config/defaults files.]

1 files changed, 21 insertions, 1 deletions

diff --git a/tools/pvcreate.c b/tools/pvcreate.c
index 3caa2594..e8c668d6 100644
--- a/tools/pvcreate.c
+++ b/tools/pvcreate.c
@@ -77,11 +77,26 @@ static int pvcreate_check(const char *name)
 static void pvcreate_single(const char *pv_name)
 {
 	struct physical_volume *pv;
+	struct id id, *idp = NULL;
+	char *uuid;
+	struct device *dev;
+
+	if (arg_count(uuidstr_ARG)) {
+		uuid = arg_str_value(uuidstr_ARG,"");
+		if (!id_read_format(&id, uuid))
+			return;
+		if ((dev = uuid_map_lookup(the_um, &id))) {
+			log_error("uuid %s already in use on %s", uuid,
+				  dev_name(dev));
+			return;
+		}
+		idp = &id;
+	}
 
 	if (!pvcreate_check(pv_name))
 		return;
 
-	if (!(pv = pv_create(fid, pv_name))) {
+	if (!(pv = pv_create(fid, pv_name, idp))) {
 		log_err("Failed to setup physical volume %s", pv_name);
 		return;
 	}
@@ -107,6 +122,11 @@ int pvcreate(int argc, char **argv)
 		return EINVALID_CMD_LINE;
 	}
 
+	if (arg_count(uuidstr_ARG) && argc != 1) {
+		log_error("Can only set uuid on one volume at once");
+		return EINVALID_CMD_LINE;
+	}
+
 	if (arg_count(yes_ARG) && !arg_count(force_ARG)) {
 		log_error("Option y can only be given with option f");
 		return EINVALID_CMD_LINE;