the mount command used to have the syntax 'mount <dev> <type> <mountpoint>'. This was changed to the more Linux like behaviour which specifies the type with the -t <type> option. If a newer barebox is run on a device with an older environment the mount command no longer works. This patch adds compatibility to the old behaviour.
Signed-off-by: Sascha Hauer <[email protected]> --- commands/mount.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/commands/mount.c b/commands/mount.c index f339c37..be26af8 100644 --- a/commands/mount.c +++ b/commands/mount.c @@ -33,7 +33,8 @@ static int do_mount(int argc, char *argv[]) int opt; int ret = 0; struct fs_device_d *fsdev; - char *type = NULL; + const char *type = NULL; + const char *mountpoint, *dev; if (argc == 1) { for_each_fs_device(fsdev) { @@ -56,7 +57,19 @@ static int do_mount(int argc, char *argv[]) if (argc < optind + 2) return COMMAND_ERROR_USAGE; - if ((ret = mount(argv[optind], type, argv[optind + 1]))) { + dev = argv[optind]; + + if (argc == optind + 3) { + /* + * Old behaviour: mount <dev> <type> <mountpoint> + */ + type = argv[optind + 1]; + mountpoint = argv[optind + 2]; + } else { + mountpoint = argv[optind + 1]; + } + + if ((ret = mount(dev, type, mountpoint))) { perror("mount"); return 1; } -- 1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
