Message ID | 20240228080304.22671-3-zajec5@gmail.com |
---|---|
State | Changes Requested |
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=S4i+2PBP; 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=B/30WiKH; 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 4Tl6MV5BtSz23qW for <incoming@patchwork.ozlabs.org>; Wed, 28 Feb 2024 19:04:38 +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=3yvmYM2yLybfa0tcMm88UMbR3l8hzbFgGBirilwkmEs=; b=S4i+2PBPtnlg/C dDI4LAQBGQTXN4S/TrzyRWFC7tBV/ZBRgJp7C72T9+LoFgvz1e6faqJeaObpwBA/tszihOwVHjB9O XWM5wjQAIJdnVZFJn/xXiytN4PNXVwHcsq0LflGOsCqs0Lk8kO/SiyWN/Q73Gdewa/b8wN0x4pv/C oq3HOj6o13xRUg0dBjyFNy2Q+k8mnQlNb0p44dr9yKD5mDZ4zWwrzA2bP03sSAusGXz4it7jVgKSR K8wX1GGeYihnvQ8ycOFmOVBKzDWlB5+0uKWvzfzpGsNrLnHh3McLfkU9wEN/fNXYHPIpNWmk54lom 4B07UMxAgFfFttvoiU5Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rfEuQ-00000008P2A-3WeT; Wed, 28 Feb 2024 08:03:22 +0000 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rfEuL-00000008Ozx-0PJc for openwrt-devel@lists.openwrt.org; Wed, 28 Feb 2024 08:03:18 +0000 Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-55a5e7fa471so7000695a12.1 for <openwrt-devel@lists.openwrt.org>; Wed, 28 Feb 2024 00:03:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709107395; x=1709712195; 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=TmVe2Le12JTxbRiwVXEe0th5CuzyVA6eUKmL/IoTftw=; b=B/30WiKHxI+alISjdCSRBWNbNKvtf94PL72wI1sd8Ad4xJrRJ5gNNXHy/zvzNdf5UY TLZOE9HTDboUTP0s1Bk+/ntNUN/N746w+vKwJbqk7qNB7qzRgOTzmqg2EXn6wNQPbe4W wZRbK7a0Ty75NNFFusV8XmDJT2Qd8EFQJNe6HFJJznk4IHD1V/exrHKH3xhQKwYQl5xk g+HWpfZQMAPQ0j0iNKe2FVYvKIZ0NVnDAM31ncSVcC29LHFOgJf7jHpYi2lYTKvAtjWP MAn0DwEf+2TljQndEZdLHEEtIacf23R0QYZ1dRUqMDPuNwjW2F0MfAg5yaxrsrt/5s6r Jz/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709107395; x=1709712195; 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=TmVe2Le12JTxbRiwVXEe0th5CuzyVA6eUKmL/IoTftw=; b=o+vGbEZXIQE3WJgbVwCqH1Xt0LhtkDRBoZgwuaE7R74XFmrMJ3Gy2BJ7kdKSHp3js0 sAqMGPbE+9jhDyRPyeR5mJ5zH61YAYfUWeVVSFdJnlKSg+JG5GnKhzA6Xb3BcW8PxYTR DyPbX7r57CUN0eaxazwHTLsT2HI66/JDH5H6URUbA2rBtGKb24DTiObhC6OD1N+n75We 0xoUK18QYL9rKbCEoHCaXeA0A1SVhtPX5pGWSxxxx7JQkl1ylVMjHc2glqFfyzkXwjvG fYfGUM/c5DATz1Kj0KT/nBxnam3zT5yLcmGfxa6m8wBJPXX2RIR4cS4kp1ZpfneR1pd9 k9fg== X-Gm-Message-State: AOJu0YyyY9Yy0YOrgAVLKB4802sGKUb534v00rMqtKT9Hrg9GdCRjc7p PCqDi6L9+9v229A1lF8ZxMBaeJEFXXsHWtuMabe8ZjwrFVckGyzDr7WIdXjY X-Google-Smtp-Source: AGHT+IHkD4D4UANjq1LrGQ+5CJ0f+CyNdk9xji2OgT0fDssxSNQJOZrMpzGYEB9YcXE1I1mr79Y2xQ== X-Received: by 2002:a05:6402:651:b0:565:6911:a82b with SMTP id u17-20020a056402065100b005656911a82bmr7300882edx.40.1709107395503; Wed, 28 Feb 2024 00:03:15 -0800 (PST) Received: from localhost.lan (031011218106.poznan.vectranet.pl. [31.11.218.106]) by smtp.gmail.com with ESMTPSA id g2-20020a056402114200b005666465520dsm459547edw.26.2024.02.28.00.03.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Feb 2024 00:03:15 -0800 (PST) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= <zajec5@gmail.com> To: openwrt-devel@lists.openwrt.org Cc: Jo-Philipp Wich <jo@mein.io>, Luiz Angelo Daros de Luca <luizluca@gmail.com>, =?utf-8?b?UmFmYcWCIE1pxYJl?= =?utf-8?b?Y2tp?= <rafal@milecki.pl>, Christian Marangi <ansuelsmth@gmail.com>, Jonas Gorski <jonas.gorski@gmail.com> Subject: [PATCH V2 3/3] base-files: sysupgrade: add uci-defaults script disabling services #2 Date: Wed, 28 Feb 2024 09:03:04 +0100 Message-Id: <20240228080304.22671-3-zajec5@gmail.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240228080304.22671-1-zajec5@gmail.com> References: <20240228080304.22671-1-zajec5@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240228_000317_152699_020F7EC0 X-CRM114-Status: UNSURE ( 9.24 ) X-CRM114-Notice: Please train this message. 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_Disabl?= =?unknown-8bit?q?ed_services_should_be_kept_disabled?= =?unknown-8bit?q?_after_sysupgrade=2E_This_can_be_easily_handled_using_a_pro?= =?unknown-8bit?q?per_uci-defaults?= =?unknown-8bit?q?_script=2E_Extend_sysupgrade_to_check_for_disabled_services?= =?unknown-8bit?q?=2C_generate_uci-defaults?= =?unknown-8bit?q?_script_disabling_them_and_include_it_in_backup=2E_?= =?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?IFsyYTAwOjE0NTA6NDg2NDoyMDowOjA6MDo1MzIgbGlzdGVkIGluXQ==?= =?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=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=5FVALID_____________Message_has_at_least_one_v?= =?unknown-8bit?q?alid_DKIM_or_DK_signature?= =?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=2E1_DKIM=5FSIGNED____________Message_has_a_DKIM_or_DK_si?= =?unknown-8bit?q?gnature=2C_not_necessarily_valid?= =?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=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_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 |
[V2,1/3] base-files: sysupgrade: add tar.sh with helpers for building archives
|
expand
|
diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade index 9d5d736aef..8c6200d7e9 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -236,6 +236,7 @@ include /lib/upgrade create_backup_archive() { local conf_tar="$1" + local disabled [ "$(rootfs_type)" = "tmpfs" ] && { echo "Cannot save config while running from ramdisk." >&2 @@ -250,6 +251,14 @@ create_backup_archive() { [ "$VERBOSE" -gt 1 ] && TAR_V="v" || TAR_V="" sed -i -e 's,^/,,' "$CONFFILES" { + for service in /etc/init.d/*; do + if ! $service enabled; then + disabled="$disabled$service disable\n" + fi + done + disabled="$disabled\nexit 0" + tar_make_member_inline "/etc/uci-defaults/10_disable_services" "$(echo -e $disabled)" + # Part of archive with installed packages info if [ "$SAVE_INSTALLED_PKGS" -eq 1 ]; then # Format: pkg-name<TAB>{rom,overlay,unknown}