Merge tag 'for-v2020.07' of https://gitlab.denx.de/u-boot/custodians/u-boot-ubi
new ubi command for renaming an UBI volume
This commit is contained in:
commit
94c03c7c77
@ -2180,6 +2180,14 @@ config CMD_UBI
|
||||
It is also strongly encouraged to also enable CONFIG_MTD to get full
|
||||
partition support.
|
||||
|
||||
config CMD_UBI_RENAME
|
||||
bool "Enable rename"
|
||||
depends on CMD_UBI
|
||||
default n
|
||||
help
|
||||
Enable a "ubi" command to rename ubi volume:
|
||||
ubi rename <oldname> <newname>
|
||||
|
||||
config CMD_UBIFS
|
||||
tristate "Enable UBIFS - Unsorted block images filesystem commands"
|
||||
depends on CMD_UBI
|
||||
|
39
cmd/ubi.c
39
cmd/ubi.c
@ -251,6 +251,39 @@ out_err:
|
||||
return err;
|
||||
}
|
||||
|
||||
static int ubi_rename_vol(char *oldname, char *newname)
|
||||
{
|
||||
struct ubi_volume *vol;
|
||||
struct ubi_rename_entry rename;
|
||||
struct ubi_volume_desc desc;
|
||||
struct list_head list;
|
||||
|
||||
vol = ubi_find_volume(oldname);
|
||||
if (!vol) {
|
||||
printf("%s: volume %s doesn't exist\n", __func__, oldname);
|
||||
return ENODEV;
|
||||
}
|
||||
|
||||
printf("Rename UBI volume %s to %s\n", oldname, newname);
|
||||
|
||||
if (ubi->ro_mode) {
|
||||
printf("%s: ubi device is in read-only mode\n", __func__);
|
||||
return EROFS;
|
||||
}
|
||||
|
||||
rename.new_name_len = strlen(newname);
|
||||
strcpy(rename.new_name, newname);
|
||||
rename.remove = 0;
|
||||
desc.vol = vol;
|
||||
desc.mode = 0;
|
||||
rename.desc = &desc;
|
||||
INIT_LIST_HEAD(&rename.list);
|
||||
INIT_LIST_HEAD(&list);
|
||||
list_add(&rename.list, &list);
|
||||
|
||||
return ubi_rename_volumes(ubi, &list);
|
||||
}
|
||||
|
||||
static int ubi_volume_continue_write(char *volume, void *buf, size_t size)
|
||||
{
|
||||
int err = 1;
|
||||
@ -604,6 +637,9 @@ static int do_ubi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
||||
return ubi_remove_vol(argv[2]);
|
||||
}
|
||||
|
||||
if (IS_ENABLED(CONFIG_CMD_UBI_RENAME) && !strncmp(argv[1], "rename", 6))
|
||||
return ubi_rename_vol(argv[2], argv[3]);
|
||||
|
||||
if (strncmp(argv[1], "skipcheck", 9) == 0) {
|
||||
/* E.g., change skip_check flag */
|
||||
if (argc == 4) {
|
||||
@ -692,6 +728,9 @@ U_BOOT_CMD(
|
||||
" - Read volume to address with size\n"
|
||||
"ubi remove[vol] volume"
|
||||
" - Remove volume\n"
|
||||
#if IS_ENABLED(CONFIG_CMD_UBI_RENAME)
|
||||
"ubi rename oldname newname\n"
|
||||
#endif
|
||||
"ubi skipcheck volume on/off - Set or clear skip_check flag in volume header\n"
|
||||
"[Legends]\n"
|
||||
" volume: character name\n"
|
||||
|
Loading…
Reference in New Issue
Block a user