Booting barebox over TFTP is a common operation that even has a default
boot target: `boot bnet`.
Once, a chainloaded barebox was tested to work, it may need to be
persisted, which needs a cumbersome:
barebox_update /mnt/tftp/${global.user}-barebox-${global.hostname}
Make this more straight-forward by interpreting barebox_update called
without any non-option argument to mean just that.
Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>
---
v1 -> v2:
- only fallback to /mnt/tftp if TFTP filesystem support is enabled
- allocate pathbuffer dynamically instead of on the stack (Sascha)
---
commands/barebox-update.c | 31 ++++++++++++++++++++++++-------
1 file changed, 24 insertions(+), 7 deletions(-)
diff --git a/commands/barebox-update.c b/commands/barebox-update.c
index 4b23433e84f2..a50de505007a 100644
--- a/commands/barebox-update.c
+++ b/commands/barebox-update.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <command.h>
#include <libfile.h>
+#include <globalvar.h>
#include <getopt.h>
#include <malloc.h>
#include <errno.h>
@@ -20,6 +21,7 @@ static void print_handlers_list(void)
static int do_barebox_update(int argc, char *argv[])
{
+ char *pathbuf = NULL;
int opt, ret, repair = 0;
struct bbu_data data = {};
struct bbu_handler *handler;
@@ -82,19 +84,34 @@ static int do_barebox_update(int argc, char *argv[])
if (argc - optind > 0) {
data.imagefile = argv[optind];
-
- image = read_file(data.imagefile, &data.len);
- if (!image)
- return -errno;
- data.image = image;
- } else {
- if (!repair)
+ } else if (!repair) {
+ if (!IS_ENABLED(CONFIG_FS_TFTP))
return COMMAND_ERROR_USAGE;
+
+ pathbuf = basprintf("/mnt/tftp/%s-barebox-%s",
+ globalvar_get("user"), globalvar_get("hostname"));
+ if (!pathbuf) {
+ ret = -ENOMEM;
+ goto out;
+ }
+
+ data.imagefile = pathbuf;
+ }
+
+ if (data.imagefile) {
+ image = read_file(data.imagefile, &data.len);
+ if (!image) {
+ ret = -errno;
+ goto out;
+ }
+ data.image = image;
}
ret = barebox_update(&data, handler);
free(image);
+out:
+ free(pathbuf);
return ret;
}
--
2.39.2
