This patch is a simple change to allow directly specifying the device
node with the "ubirmvol" command.
Originally, the ubirmvol command would have to be similar to this:
ubirmvol ubi0 root
With this patch, you can use a "-d" option and issue the command like
this instead:
ubirmvol -d /dev/ubi0.root
This has the advantage of supporting command line expansion, which
allows for operations like:
ubirmvol -d /dev/ubi0.*
or
ubirmvol -d /dev/ubi0.data*
This functionality can be quite useful for use in automated upgrade
scripts for clearing ubi volumes when the total number of pre-existing
volumes may not be known ahead of time.
Signed-off-by: Michael Burkey <mdburkey at gmail.com>
---
diff -rupN a/commands/ubi.c b/commands/ubi.c
--- a/commands/ubi.c 2014-05-05 04:33:13.000000000 -0400
+++ b/commands/ubi.c 2014-05-08 14:02:37.606173280 -0400
@@ -139,30 +139,85 @@ static int do_ubirmvol(int argc, char *a
{
struct ubi_mkvol_req req;
int fd, ret;
-
- if (argc != 3)
- return COMMAND_ERROR_USAGE;
-
- strncpy(req.name, argv[2], UBI_VOL_NAME_MAX);
- req.name[UBI_VOL_NAME_MAX] = 0;
-
- fd = open(argv[1], O_WRONLY);
- if (fd < 0) {
- perror("open");
- return 1;
+ int result = 0;
+ int usedev = 0;
+ int argc_min;
+ int opt;
+ int verbose = 0;
+ char *base=NULL;
+ char *dev=NULL;
+ int i;
+
+ while ((opt = getopt(argc, argv, "dv")) > 0)
+ {
+ switch (opt)
+ {
+ case 'd':
+ usedev = 1;
+ break;
+ case 'v':
+ verbose = 1;
+ break;
+ }
}
+
+ argc_min = optind + (usedev ? 1 : 2);
+
+ if (argc < argc_min)
+ return COMMAND_ERROR_USAGE;
- ret = ioctl(fd, UBI_IOCRMVOL, &req);
- if (ret)
- printf("failed to delete: %s\n", strerror(-ret));
- close(fd);
+ for (i=optind; i < (usedev ? argc : optind+1); i++)
+ {
+ base=argv[i];
+
+ if (usedev)
+ {
+ dev = strchr(argv[i], '.');
+ if(dev)
+ {
+ *dev = 0;
+ dev++;
+ }
+ }
+ else
+ {
+ dev=argv[i+1];
+ }
+
+ if (dev == NULL)
+ {
+ printf("No target device specified.\n");
+ return COMMAND_ERROR_USAGE;
+ }
+
+ if (verbose)
+ printf("Removing %s.%s\n",base,dev);
+
+ strncpy(req.name, dev, UBI_VOL_NAME_MAX);
+ req.name[UBI_VOL_NAME_MAX] = 0;
+
+ fd = open(base, O_WRONLY);
+ if (fd < 0) {
+ perror("open");
+ return 1;
+ }
+
+ ret = ioctl(fd, UBI_IOCRMVOL, &req);
+ if (ret)
+ printf("failed to delete: %s\n", strerror(-ret));
+ close(fd);
+
+ result |= ret;
+ }
- return ret ? 1 : 0;
+ return result ? 1 : 0;
}
static const __maybe_unused char cmd_ubirmvol_help[] =
"Usage: ubirmvol <ubidev> <name>\n"
-"Delete ubi volume <name> from <ubidev>\n";
+"or ubirmvol -d <ubi device node> [ubi device node] ...\n"
+"Delete ubi volume <name> from <ubidev>\n"
+"or delete <ubi device node> (e.g. /dev/ubi0.root)";
BAREBOX_CMD_START(ubirmvol)
.cmd = do_ubirmvol,
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
