From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 01 Jul 2024 12:23:05 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sOEBd-000TJv-1l for lore@lore.pengutronix.de; Mon, 01 Jul 2024 12:23:05 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sOEBc-0007yr-VD for lore@pengutronix.de; Mon, 01 Jul 2024 12:23:05 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=om0V+WiT8XV52BG2JkbNx2h9Jn9iPaheedP15hUyMOw=; b=ignQCRFfkgebTygkI3pjtB13ba ee1KKFJ3u51LNiLxmF+928Sv87sGdujpdzw0OCMP+J/WTbcPCDB1ta1AaAXyn9RXNwZ9uhJ4bwVWE +U4m54Z+U1m5Hpk8ZwabvX15R/CUyAs4QwKcwTtMiXwuBW7IBQYI77WMOE9qMExprqB7sslPv/6Vl KQR1uZJbXFYz5UzemvpN8J6Pp+Bncyy0jxvkQIuPlgygF4TMID6Be8NiXc/nH495FLpGwOpEGZfzg qfSlQG/gVfWJLVZL/Vul2gr2wtuRei4OxeDJmvOTPRZ77ar0DMS8oEDnWBkDw6olII7UJGD6bBR0J V6eAOu/A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sOEBA-00000002diy-3Id8; Mon, 01 Jul 2024 10:22:36 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sOEB7-00000002dgR-2I55 for barebox@lists.infradead.org; Mon, 01 Jul 2024 10:22:34 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sOEB5-0007sY-Ss; Mon, 01 Jul 2024 12:22:31 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1sOEB5-006LgW-GH; Mon, 01 Jul 2024 12:22:31 +0200 Received: from localhost ([::1] helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1sOEB5-00GKOn-1M; Mon, 01 Jul 2024 12:22:31 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Mon, 1 Jul 2024 12:22:29 +0200 Message-Id: <20240701102229.3891590-1-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240701_032233_615898_1C2167B1 X-CRM114-Status: GOOD ( 14.44 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.2 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v2] bbu: command: update via TFTP if no image given X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) 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 --- 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 #include #include +#include #include #include #include @@ -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