{"id":1148281,"url":"http://patchwork.ozlabs.org/api/patches/1148281/?format=json","web_url":"http://patchwork.ozlabs.org/project/openwrt/patch/20190816150517.29633-1-zajec5@gmail.com/","project":{"id":45,"url":"http://patchwork.ozlabs.org/api/projects/45/?format=json","name":"OpenWrt development","link_name":"openwrt","list_id":"openwrt-devel.lists.openwrt.org","list_email":"openwrt-devel@lists.openwrt.org","web_url":"http://openwrt.org/","scm_url":"git://git.openwrt.org/openwrt.git","webscm_url":"https://dev.openwrt.org/browser","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20190816150517.29633-1-zajec5@gmail.com>","list_archive_url":null,"date":"2019-08-16T15:05:16","name":"[OpenWrt-Devel,1/2] base-files: pass \"save_config\" option to the \"sysupgrade\" method","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"c071e7cdb6e2d5129765bf72dbf501972b7ae109","submitter":{"id":5824,"url":"http://patchwork.ozlabs.org/api/people/5824/?format=json","name":"Rafał Miłecki","email":"zajec5@gmail.com"},"delegate":{"id":54625,"url":"http://patchwork.ozlabs.org/api/users/54625/?format=json","username":"rmilecki","first_name":"Rafał","last_name":"Miłecki","email":"zajec5@gmail.com"},"mbox":"http://patchwork.ozlabs.org/project/openwrt/patch/20190816150517.29633-1-zajec5@gmail.com/mbox/","series":[{"id":125618,"url":"http://patchwork.ozlabs.org/api/series/125618/?format=json","web_url":"http://patchwork.ozlabs.org/project/openwrt/list/?series=125618","date":"2019-08-16T15:05:16","name":"[OpenWrt-Devel,1/2] base-files: pass \"save_config\" option to the \"sysupgrade\" method","version":1,"mbox":"http://patchwork.ozlabs.org/series/125618/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1148281/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1148281/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org\n\t(client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org;\n\tenvelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org;\n\treceiver=)","ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=gmail.com","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=lists.infradead.org\n\theader.i=@lists.infradead.org header.b=\"RrBT8V20\"; \n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"iVs3BG1K\"; dkim-atps=neutral"],"Received":["from bombadil.infradead.org (bombadil.infradead.org\n\t[IPv6:2607:7c80:54:e::133])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (4096 bits)\n\tserver-digest SHA256) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 46968C3Ymrz9sNC\n\tfor ;\n\tSat, 17 Aug 2019 01:05:47 +1000 (AEST)","from localhost ([127.0.0.1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux))\n\tid 1hydnM-0000yg-3x; Fri, 16 Aug 2019 15:05:36 +0000","from mail-lf1-x143.google.com ([2a00:1450:4864:20::143])\n\tby bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux))\n\tid 1hydnG-0000xx-Ql\n\tfor openwrt-devel@lists.openwrt.org; Fri, 16 Aug 2019 15:05:34 +0000","by mail-lf1-x143.google.com with SMTP id b29so4287576lfq.1\n\tfor ;\n\tFri, 16 Aug 2019 08:05:30 -0700 (PDT)","from localhost.localdomain\n\t(ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233])\n\tby smtp.gmail.com with ESMTPSA id\n\tw21sm961810lfl.84.2019.08.16.08.05.27\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tFri, 16 Aug 2019 08:05:28 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20170209; h=Sender:\n\tContent-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post:\n\tList-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To\n\t:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:\n\tResent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:\n\tList-Owner; bh=JgM92/IXdvGYtAMP+vnbbq1XJs+4QN4FyRWsmTpbPGU=;\n\tb=RrBT8V20fdjoSr\n\t2ee5s57yt4n3i9v7E4WaFPau6tMS7kMpMjToBi2lkjB/BFTWqIZ5zw9ZfL7s+HgFANGdqTtS+m7rj\n\tXVzZdoGckjrIIDd/8jE+hjsQWXMDyio0mmb4asM7kE3JjHD2EHYbBG4m0Ho1rzrewKsFjIysIqcAY\n\tL1rKRY1TFw8ixg9HJW1Jj+E3B298YCJiFfFJlW+DvC0BjtdQ2QvXo3AAiREe1GJWa+kid9MyQ2q5s\n\tBiQkshhWfpUHijG8h4Lxlj5E1HydKu0c+PYq29wkCUyarM0q00OoeCFkd+xuYsXQ3zm+sNrAFfg2y\n\tR00F/SGsIw312IRNj4WQ==;","v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:mime-version\n\t:content-transfer-encoding;\n\tbh=0OxlwDfb3nu5prCQclWPP23dcNNKf7enlvT927qD9AY=;\n\tb=iVs3BG1Kmak3g5WLPc9tPnzgcPb+BfzUXXXKsYucoWsdq2jNcq2s+kEfiCsdIULNNO\n\t8xz+Wa+5yY9yaKAXrCKQe/i0Rmcz6VyUP3yNs3VMXAOQUqS9Gahk6riFyvzNGURGa98E\n\t7quf9UCoAKcAWC35291rDYI7JX0P2+534+wmslwwLgI+/ODxLxXY0WFiRAG3SzBbYdOy\n\tnXvavL6vrfeVIJLDpWwBr/GqrdYyH+nYjCJeQYFV8U8UeTnHIM0MCGnWaa1Lm4EWI3ko\n\t0BkenKniYWGtc/zr+e5uSOo0GG3ILEOIB2IDK17EVjZq4fKdrNk8Q0kwr8pdv1VvM8PY\n\tIBrQ=="],"X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version\n\t:content-transfer-encoding;\n\tbh=0OxlwDfb3nu5prCQclWPP23dcNNKf7enlvT927qD9AY=;\n\tb=UsG0R2IN1pcVR5reaV/dEtf8ULFglnh+sppcZIJLZTWtKBDEez5pXzzX10UUEfjqnk\n\taBEY/a/aUtlvNrBpEkfdaFZLY/X/5KehnmRSyqtccLPbzVFuzPFL13bteTzpUrxszF5F\n\tKKj+BfSzabaay1yXLcJ4Vv4nu1ytwO2WGo9pHjXMfR4LKEqhErkjMRi9nzEeDcvGfhgs\n\tIZeTIHWPIEBw/LB+9Lj0KUIm/l43xEH/gK4r3L/pW8QbuzwrVf6nYyx7Nqduz6+TcttB\n\tKEAB/mzX8YS43LyPhHMc32gHZPNMWomos5PN7lLgnCHtNxiaAjYZPhlLzDU65DGi1Oep\n\txRgg==","X-Gm-Message-State":"APjAAAVb61OCy53VT0IqrmzWnzqPC+tHpcx5Q9fmY7YiltFqgaXFUsi8\n\t/t1WkIX2+uFdVy+Q5RL2MizVpXdJ","X-Google-Smtp-Source":"APXvYqw3TygkzJS18Pdqd9Lc2zZiFsL/1kec6eVaOOO7osjqaNR8iFrlVcYBZNV6gBWa/3HR2BlIig==","X-Received":"by 2002:ac2:5442:: with SMTP id d2mr5751314lfn.70.1565967928762; \n\tFri, 16 Aug 2019 08:05:28 -0700 (PDT)","From":"=?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= ","To":"openwrt-devel@lists.openwrt.org","Date":"Fri, 16 Aug 2019 17:05:16 +0200","Message-Id":"<20190816150517.29633-1-zajec5@gmail.com>","X-Mailer":"git-send-email 2.21.0","MIME-Version":"1.0","X-CRM114-Version":"20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ","X-CRM114-CacheID":"sfid-20190816_080533_355785_DDB986B5 ","X-CRM114-Status":"GOOD ( 10.21 )","X-Spam-Score":"0.1 (/)","X-Spam-Report":"SpamAssassin version 3.4.2 on bombadil.infradead.org summary:\n\tContent analysis details: (0.1 points)\n\tpts rule name description\n\t---- ----------------------\n\t--------------------------------------------------\n\t-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,\n\tno trust [2a00:1450:4864:20:0:0:0:143 listed in]\n\t[list.dnswl.org]\n\t0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\n\tprovider (zajec5[at]gmail.com)\n\t-0.0 SPF_PASS SPF: sender matches SPF record\n\t0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record\n\t0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends\n\tin digit (zajec5[at]gmail.com)\n\t-0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from\n\tauthor's domain\n\t-0.1 DKIM_VALID Message has at least one valid DKIM or DK signature\n\t0.1 DKIM_SIGNED Message has a DKIM or DK signature,\n\tnot necessarily valid\n\t-0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from\n\tenvelope-from domain","Subject":"[OpenWrt-Devel] [PATCH 1/2] base-files: pass \"save_config\" option\n\tto the \"sysupgrade\" method","X-BeenThere":"openwrt-devel@lists.openwrt.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":", \n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":", \n\t","Cc":"=?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= ,\n\tJo-Philipp Wich , John Crispin ","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Sender":"\"openwrt-devel\" ","Errors-To":"openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org"},"content":"From: Rafał Miłecki \n\nThis explicitly lets stage2 know if config should be preserved.\n\nSigned-off-by: Rafał Miłecki \n---\n package/base-files/files/lib/upgrade/common.sh | 2 +-\n package/base-files/files/lib/upgrade/do_stage2 | 2 +-\n package/base-files/files/lib/upgrade/stage2 | 2 --\n package/base-files/files/sbin/sysupgrade | 5 ++++-\n 4 files changed, 6 insertions(+), 5 deletions(-)","diff":"diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh\nindex 2afa0addb4..efa301cd95 100644\n--- a/package/base-files/files/lib/upgrade/common.sh\n+++ b/package/base-files/files/lib/upgrade/common.sh\n@@ -218,7 +218,7 @@ indicate_upgrade() {\n # $(2): (optional) pipe command to extract firmware, e.g. dd bs=n skip=m\n default_do_upgrade() {\n \tsync\n-\tif [ \"$SAVE_CONFIG\" -eq 1 ]; then\n+\tif [ \"$UPGRADE_OPT_SAVE_CONFIG\" -eq 1 ]; then\n \t\tget_image \"$1\" \"$2\" | mtd $MTD_ARGS $MTD_CONFIG_ARGS -j \"$CONF_TAR\" write - \"${PART_NAME:-image}\"\n \telse\n \t\tget_image \"$1\" \"$2\" | mtd $MTD_ARGS write - \"${PART_NAME:-image}\"\ndiff --git a/package/base-files/files/lib/upgrade/do_stage2 b/package/base-files/files/lib/upgrade/do_stage2\nindex 8aae452560..0e6cc1bfc3 100755\n--- a/package/base-files/files/lib/upgrade/do_stage2\n+++ b/package/base-files/files/lib/upgrade/do_stage2\n@@ -11,7 +11,7 @@ else\n \tdefault_do_upgrade \"$IMAGE\"\n fi\n \n-if [ \"$SAVE_CONFIG\" -eq 1 ] && type 'platform_copy_config' >/dev/null 2>/dev/null; then\n+if [ \"$UPGRADE_OPT_SAVE_CONFIG\" -eq 1 ] && type 'platform_copy_config' >/dev/null 2>/dev/null; then\n \tplatform_copy_config\n fi\n \ndiff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2\nindex fef121f37c..4e5837af83 100755\n--- a/package/base-files/files/lib/upgrade/stage2\n+++ b/package/base-files/files/lib/upgrade/stage2\n@@ -6,7 +6,6 @@\n export IMAGE=\"$1\"\n COMMAND=\"$2\"\n \n-export SAVE_CONFIG=1\n export SAVE_PARTITIONS=1\n \n export INTERACTIVE=0\n@@ -18,7 +17,6 @@ RAMFS_COPY_BIN=\t\t# extra programs for temporary ramfs root\n RAMFS_COPY_DATA=\t# extra data files\n \n \n-[ -f \"$CONF_TAR\" ] || export SAVE_CONFIG=0\n [ -f /tmp/sysupgrade.always.overwrite.bootdisk.partmap ] && export SAVE_PARTITIONS=0\n \n include /lib/upgrade\ndiff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade\nindex 001e644476..15514159b3 100755\n--- a/package/base-files/files/sbin/sysupgrade\n+++ b/package/base-files/files/sbin/sysupgrade\n@@ -369,6 +369,9 @@ else\n \tubus call system sysupgrade \"{\n \t\t\\\"prefix\\\": $(json_string \"$RAM_ROOT\"),\n \t\t\\\"path\\\": $(json_string \"$IMAGE\"),\n-\t\t\\\"command\\\": $(json_string \"$COMMAND\")\n+\t\t\\\"command\\\": $(json_string \"$COMMAND\"),\n+\t\t\\\"options\\\": {\n+\t\t\t\\\"save_config\\\": $SAVE_CONFIG\n+\t\t}\n \t}\"\n fi\n","prefixes":["OpenWrt-Devel","1/2"]}