shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-11 20:58:50 +03:00
Code Releases Activity

dmsetup: also apply 'mangle' command for UUIDs

Browse Source 
Compared to names, UUIDs can't be renamed once they are created
for a device. The 'mangle' command will just issue an error message
about a need for manual intervention in this case - reactivating the
device (remove + create) does the job as the defualt mangling mode
used is "auto" and that will assign a correct mangled form the UUID.
This commit is contained in:
Peter Rajnoha 2012-10-10 17:03:47 +02:00
parent 788b7a6a2b
commit 470d1a2f54
1 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
tools/dmsetup.c
View File

@ -2943,8 +2943,8 @@ static int _ls(CMD_ARGS)
static int _mangle(CMD_ARGS) static int _mangle(CMD_ARGS)
{ {
char *name; const char *name, *uuid;
char *new_name = NULL; char *new_name = NULL, *new_uuid = NULL;
struct dm_task *dmt; struct dm_task *dmt;
struct dm_info info; struct dm_info info;
int r = 0; int r = 0;
@ -2973,25 +2973,49 @@ static int _mangle(CMD_ARGS)
if (!dm_task_get_info(dmt, &info) || !info.exists) if (!dm_task_get_info(dmt, &info) || !info.exists)
goto out; goto out;
uuid = dm_task_get_uuid(dmt);
target_format = _switches[MANGLENAME_ARG] ? _int_args[MANGLENAME_ARG] target_format = _switches[MANGLENAME_ARG] ? _int_args[MANGLENAME_ARG]
: DEFAULT_DM_NAME_MANGLING; : DEFAULT_DM_NAME_MANGLING;
if (target_format == DM_STRING_MANGLING_AUTO && strstr(name, "\\x5cx")) { if (target_format == DM_STRING_MANGLING_AUTO) {
log_error("The name \"%s\" seems to be mangled more than once. " if (strstr(name, "\\x5cx")) {
"Manual intervention required to rename the device.", name); log_error("The name \"%s\" seems to be mangled more than once. "
goto out; "Manual intervention required to rename the device.", name);
goto out;
}
if (strstr(uuid, "\\x5cx")) {
log_error("The UUID \"%s\" seems to be mangled more than once. "
"Manual intervention required to correct the device UUID.", uuid);
goto out;
}
} }
if (target_format == DM_STRING_MANGLING_NONE) { if (target_format == DM_STRING_MANGLING_NONE) {
if (!(new_name = dm_task_get_name_unmangled(dmt))) if (!(new_name = dm_task_get_name_unmangled(dmt)))
goto out; goto out;
if (!(new_uuid = dm_task_get_uuid_unmangled(dmt)))
goto out;
} }
else if (!(new_name = dm_task_get_name_mangled(dmt))) else {
if (!(new_name = dm_task_get_name_mangled(dmt)))
goto out;
if (!(new_uuid = dm_task_get_uuid_mangled(dmt)))
goto out;
}
/* We can't rename the UUID, the device must be reactivated manually. */
if (strcmp(uuid, new_uuid)) {
log_error("%s: %s: UUID in incorrect form. ", name, uuid);
log_error("Unable to change device UUID. The device must be deactivated first.");
r = 0;
goto out; goto out;
}
/* Nothing to do if the name is in correct form already. */ /* Nothing to do if the name is in correct form already. */
if (!strcmp(name, new_name)) { if (!strcmp(name, new_name)) {
log_print("%s: name already in correct form", name); log_print("%s: %s: name %salready in correct form", name,
*uuid ? uuid : "[no UUID]", *uuid ? "and UUID " : "");
r = 1; r = 1;
goto out; goto out;
} }
@ -3003,6 +3027,7 @@ static int _mangle(CMD_ARGS)
out: out:
dm_free(new_name); dm_free(new_name);
dm_free(new_uuid);
dm_task_destroy(dmt); dm_task_destroy(dmt);
return r; return r;
} }