From patchwork Sun Sep 18 11:45:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6000 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4MVmGH3C3xz3wcK for ; Sun, 18 Sep 2022 11:45:43 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4MVmGG1vlFz1Qd; Sun, 18 Sep 2022 11:45:42 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4MVmGG08sSz2y1h; Sun, 18 Sep 2022 11:45:42 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4MVmGD49sRz2xPJ for ; Sun, 18 Sep 2022 11:45:40 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4MVmGC5HyBzLs; Sun, 18 Sep 2022 11:45:39 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1663501539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=VsVsQilNkwesNWWgaFHN6Cx58AC+RuxxvTulVXfuPoY=; b=lCHLRaH5VX7pyz1gcYicmTGhK/XsJHdcZgjwrN8WdWSB3pSNZuFqyPRUxFQNwwSjUqtVmQ JATQvgpFYV9zfCDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1663501539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=VsVsQilNkwesNWWgaFHN6Cx58AC+RuxxvTulVXfuPoY=; b=qCKoSNwcVnx9bm+HBt/d3oQA5Gx+hkEK9s9LtIE6DujjbOSCyi6wqDcyoGcegjXH3OwpAL Qb/p7BSmE3uGAbSyfFQCu222U3z8emm4WH/pNtbRNKVA3To8KEK6RcFknBmMTrgUSTx7Xg BsafZzd39XSCvPHtBcj83PNVI4k+qM0KBUm8f2Q2RRdpc5Ye3AvXWIQt0OZm6juRxsq8sn PPiQH9lQq/vDeN/Q6FlIbXSjXytBk+IDAr6rjttvGxqzB04ZAp55qeBluXVOF++CFXsc+y cAIyl2vYjbyiqa4HVUyaWhky7rl2z3yBD7kLbO4Z2WGadG3ZWwADHGSPvUgM0A== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] backupiso: Update to ISO file naming - bug#12932 Date: Sun, 18 Sep 2022 13:45:17 +0200 Message-Id: <20220918114517.7508-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - commit https://git.ipfire.org/?p=ipfire-2.x.git;a=commit;h=fbd0608c2cb5372fff7857065ec7e605b1bf9cf7 aligned the ISO file name to the image file name. This change also needed to be added to backupiso as the filename is used to download the iso from the IPFire server when creating an ISO backup. Fixes: Bug#12932 Suggested-by: Matthias Fischer Tested-by: Adolf Belka Signed-off-by: Adolf Belka Reviewed-by: Bernhard Bitsch --- src/scripts/backupiso | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/backupiso b/src/scripts/backupiso index ef017e3be..2a016e067 100644 --- a/src/scripts/backupiso +++ b/src/scripts/backupiso @@ -35,7 +35,7 @@ case "${arch}" in esac URL="https://downloads.ipfire.org/releases/ipfire-2.x/$IPFVER-core$COREVER/" -ISO="ipfire-$IPFVER.$arch-full-core$COREVER.iso" +ISO="ipfire-$IPFVER-core$COREVER-$arch.iso" makeiso() { local dir="${1}"