Message ID | 20240212105701.5812-5-zajec5@gmail.com |
---|---|
State | Accepted |
Delegated to: | Rafał Miłecki |
Headers | show
Return-Path: <openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=lMMorCkL; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=koq25mNZ; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TYLzt4KqQz23hw for <incoming@patchwork.ozlabs.org>; Mon, 12 Feb 2024 21:58:49 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=tjM/0vMQh2l/h7us+dQshz+7YlmSxbd+VE4M1qPRP3U=; b=lMMorCkLMeESh+ zq108QC1K8IJYl0hAyY0lVhzCHfYypsB2vNhMJ64Hd/IS7hy181GqiOWNOlTzj5NLtM9wzkl2hkZ1 3mAMolJ7sQ1QkyCNpth81ROnf9hRihopD3s40SiuqPgUmTId1dBuIDQiiTLe73dNK/fl4/6HqcPYi peZGfT1ZojmhO0GxkalF+Hw3fpRNHvNrVg0X242+dtUVRgNqGhEVEBls3eOpekbsSt8RhfQEBvCv9 +zz3aITV0EEV5qDYPcSyzHCVd7YsHpA4YoXRGBwviO61BvtNxzPG3ovhpDQDbOycEEXWbk4w6QDif FA6+cUlcijyKoNIbm4WA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rZU0Y-000000050Qc-23x7; Mon, 12 Feb 2024 10:57:54 +0000 Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rZU0U-000000050PH-0pbA for openwrt-devel@lists.openwrt.org; Mon, 12 Feb 2024 10:57:51 +0000 Received: by mail-ed1-x530.google.com with SMTP id 4fb4d7f45d1cf-55a179f5fa1so4002689a12.0 for <openwrt-devel@lists.openwrt.org>; Mon, 12 Feb 2024 02:57:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707735469; x=1708340269; darn=lists.openwrt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4HjQZ3s96np4wR6yO+y54ychE2u5IfTueXcuWRKUyK0=; b=koq25mNZdBIXj/eymFVrZD7WNSRayXcMg3FZlipNsQnD0Rm2ywano3fCaOZXdwiiZy yUE8VJut49s4r9ZteQtXDmvd7+zs/U5qcOpKzUENmw+3ZfHMJU4P3VBN/Bh0pT3WO1Cb URwj+f/VupUrq3HtVzbtVR7DFmMWsPQ/rShH+G1RsyjLdOX3V/AkJ4Sofu87zHqtappK qvBNE36LkwcaYsvbi5EHIWI/hIqovWCeQs8SQJSq/Li6v9245/z+MhfYlMIrNTxVPJJV DMhRVrltUq37rR3GVVu9BXMSqmuIgmcEiGv8iMWbgpXjyRJnLd+o/PXPEd017fdPDSPJ R5Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707735469; x=1708340269; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4HjQZ3s96np4wR6yO+y54ychE2u5IfTueXcuWRKUyK0=; b=CDjUnaJFofEI4u+ZPDsQP9f1b2ZTvSUQjGV+bBPuI562wQ59XelumvOylpw1Gmj+7q twqpzYFpbxZEHiQjcpG7Is4l1UrSJbWa3w9SLCo7DLG798v1F3fLfSLB1jcyEsJQgpyz vXyt27mvk1+Z4RVRS1yWl9VkK9QK0i1fk+wmw7ZhpPe7kXK4GiGIy5ytfGgW9kyN+EUG DmVrIjpipzb6ukrcJF9uIGFIV5dW5t7KZoi9d7g8BWG1Vfl1xmaf5d3+PS9fyD4tlHzb 3S4x+JbgF+sps8w08KWG4frJ3V47Rw/p/6kJQ4ctTtdiTfnO4RxMZRerQ9t4ubWtwdEa PLcQ== X-Gm-Message-State: AOJu0Yx2UQDOJJKGfJ3P7/SvRGVm5ECQa0/5sKHFMJPLa31tRJ15V6Av ooSra5a90UePxQHDo+vDKB8qRSEDgBBYKsknMptto6JbA8EG2msxTP05FLWH X-Google-Smtp-Source: AGHT+IFdeUkBp1JOHb5Hvyh4P9veVUqdOAX/KnJPbHEdQli5QKEl45wNMuhNBfJT1ofu3QIMYdo0PQ== X-Received: by 2002:a17:906:e0e:b0:a38:47f:51b4 with SMTP id l14-20020a1709060e0e00b00a38047f51b4mr4552910eji.47.1707735468508; Mon, 12 Feb 2024 02:57:48 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCV2ZavAtoaC2JTpZfRs6D+iYaqkwnGHNyzcWHF4PhxrddszcgE7VYwDalQe9H3c8MPzBLMVfwjJ5SqNJ/geigH0jQh1wlNcgSnURA== Received: from localhost.lan (031011218106.poznan.vectranet.pl. [31.11.218.106]) by smtp.gmail.com with ESMTPSA id e2-20020a17090681c200b00a3c8f4bc31bsm91394ejx.38.2024.02.12.02.57.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Feb 2024 02:57:48 -0800 (PST) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= <zajec5@gmail.com> To: openwrt-devel@lists.openwrt.org Cc: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= <rafal@milecki.pl> Subject: [PATCH 5/5] base-files: sysupgrade: rename add_*files() functions Date: Mon, 12 Feb 2024 11:57:01 +0100 Message-Id: <20240212105701.5812-5-zajec5@gmail.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240212105701.5812-1-zajec5@gmail.com> References: <20240212105701.5812-1-zajec5@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240212_025750_264687_FB1745EB X-CRM114-Status: GOOD ( 10.26 ) X-Spam-Score: 0.0 (/) X-Spam-Report: =?unknown-8bit?q?Spam_detection_software=2C_running_on_the_sy?= =?unknown-8bit?q?stem_=22bombadil=2Einfradead=2Eorg=22=2C?= =?unknown-8bit?q?_has_NOT_identified_this_incoming_email_as_spam=2E__The_ori?= =?unknown-8bit?q?ginal?= =?unknown-8bit?q?_message_has_been_attached_to_this_so_you_can_view_it_or_la?= =?unknown-8bit?q?bel?= =?unknown-8bit?q?_similar_future_email=2E__If_you_have_any_questions=2C_see?= =?unknown-8bit?q?_the_administrator_of_that_system_for_details=2E?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_preview=3A__From=3A_Rafa=C5=82_Mi=C5=82ecki_Usage_?= =?unknown-8bit?q?of_word_=22add=22_was_somehow_misleading?= =?unknown-8bit?q?_in_those_functions=3A_1=2E_They_don=27t_really_add_=28as_i?= =?unknown-8bit?q?n=3A_append=29_anything=2E_Result?= =?unknown-8bit?q?_files_are_created_from_scratch=2E_2=2E_It_wasn=27t_clear_w?= =?unknown-8bit?q?hat_adding_files_means=2E?= =?unknown-8bit?b?IEl0IFsuLi5dIA==?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_analysis_details=3A___=280=2E0_points=2C_5=2E0_req?= =?unknown-8bit?q?uired=29?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_pts_rule_name______________description?= =?unknown-8bit?q?_----_----------------------_------------------------------?= =?unknown-8bit?q?--------------------?= =?unknown-8bit?q?_-0=2E0_RCVD=5FIN=5FDNSWL=5FNONE_____RBL=3A_Sender_listed_a?= =?unknown-8bit?q?t_https=3A//www=2Ednswl=2Eorg/=2C_no?= =?unknown-8bit?q?_trust?= =?unknown-8bit?b?IFsyYTAwOjE0NTA6NDg2NDoyMDowOjA6MDo1MzAgbGlzdGVkIGluXQ==?= =?unknown-8bit?b?IFtsaXN0LmRuc3dsLm9yZ10=?= =?unknown-8bit?q?_-0=2E0_SPF=5FPASS_______________SPF=3A_sender_matches_SPF_?= =?unknown-8bit?q?record?= =?unknown-8bit?q?_0=2E0_SPF=5FHELO=5FNONE__________SPF=3A_HELO_does_not_publ?= =?unknown-8bit?q?ish_an_SPF_Record?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID_____________Message_has_at_least_one_v?= =?unknown-8bit?q?alid_DKIM_or_DK_signature?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FAU__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from_author=27s?= =?unknown-8bit?q?_domain?= =?unknown-8bit?q?_0=2E1_DKIM=5FSIGNED____________Message_has_a_DKIM_or_DK_si?= =?unknown-8bit?q?gnature=2C_not_necessarily_valid?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FEF__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from?= =?unknown-8bit?q?_envelope-from_domain?= =?unknown-8bit?q?_0=2E2_FREEMAIL=5FENVFROM=5FEND=5FDIGIT_Envelope-from_freem?= =?unknown-8bit?q?ail_username_ends_in?= =?unknown-8bit?q?_digit?= =?unknown-8bit?q?_=5Bzajec5=28at=29gmail=2Ecom=5D?= =?unknown-8bit?q?_0=2E0_FREEMAIL=5FFROM__________Sender_email_is_commonly_ab?= =?unknown-8bit?q?used_enduser_mail_provider?= =?unknown-8bit?q?_=5Bzajec5=28at=29gmail=2Ecom=5D?= =?unknown-8bit?q?_-0=2E0_T=5FSCC=5FBODY=5FTEXT=5FLINE___No_description_avail?= =?unknown-8bit?q?able=2E?= X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List <openwrt-devel.lists.openwrt.org> List-Unsubscribe: <https://lists.openwrt.org/mailman/options/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=unsubscribe> List-Archive: <http://lists.openwrt.org/pipermail/openwrt-devel/> List-Post: <mailto:openwrt-devel@lists.openwrt.org> List-Help: <mailto:openwrt-devel-request@lists.openwrt.org?subject=help> List-Subscribe: <https://lists.openwrt.org/mailman/listinfo/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "openwrt-devel" <openwrt-devel-bounces@lists.openwrt.org> Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org |
Series |
[1/5] base-files: sysupgrade: replace UMOUNT_ETCBACKUP_DIR with a local variable
|
expand
|
diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade index e7de1f3446..1fcd44da2a 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -155,7 +155,7 @@ list_static_conffiles() { \( -type f -o -type l \) $filter 2>/dev/null } -add_conffiles() { +build_list_of_backup_config_files() { local file="$1" ( list_static_conffiles "$find_filter"; list_changed_conffiles ) | @@ -163,7 +163,7 @@ add_conffiles() { return 0 } -add_overlayfiles() { +build_list_of_backup_overlay_files() { local file="$1" local packagesfiles=$1.packagesfiles @@ -218,9 +218,9 @@ if [ $SAVE_OVERLAY = 1 ]; then echo "Cannot find '/overlay/upper/etc', required for '-c'" >&2 exit 1 } - sysupgrade_init_conffiles="add_overlayfiles" + sysupgrade_init_conffiles="build_list_of_backup_overlay_files" else - sysupgrade_init_conffiles="add_conffiles" + sysupgrade_init_conffiles="build_list_of_backup_config_files" fi find_filter=""