This commit add the command ubi rename to rename an ubi volume. The format of the command is: ubi rename <oldname> <newname>. To enable this command, the option CMD_UBI_RENAME must be selected.

Signed-off-by: Philippe Reynes philippe.reynes@softathome.com --- cmd/Kconfig | 8 ++++++++ cmd/ubi.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+)

Changelog: v2: - added an option CMD_UBI_RENAME (feedback from Wolfgang)

diff --git a/cmd/Kconfig b/cmd/Kconfig index 6403bc4..1564694 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -2172,6 +2172,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 diff --git a/cmd/ubi.c b/cmd/ubi.c index cecf251..4885661 100644 --- a/cmd/ubi.c +++ b/cmd/ubi.c @@ -251,6 +251,41 @@ out_err: return err; }

+#ifdef CONFIG_CMD_UBI_RENAME +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); +} +#endif /* CONFIG_CMD_UBI_RENAME */ + static int ubi_volume_continue_write(char *volume, void *buf, size_t size) { int err = 1; @@ -604,6 +639,11 @@ static int do_ubi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return ubi_remove_vol(argv[2]); }

+#ifdef CONFIG_CMD_UBI_RENAME + if (strncmp(argv[1], "rename", 6) == 0) + return ubi_rename_vol(argv[2], argv[3]); +#endif + if (strncmp(argv[1], "skipcheck", 9) == 0) { /* E.g., change skip_check flag */ if (argc == 4) { @@ -692,6 +732,9 @@ U_BOOT_CMD( " - Read volume to address with size\n" "ubi remove[vol] volume" " - Remove volume\n" +#ifdef 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"