| Message ID | 20180112112341.31116-1-ldir@darbyshire-bryant.me.uk |
|---|---|
| State | Accepted |
| Headers | show
Return-Path: <lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Kb5GSlfp"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=darbyshire-bryant.me.uk header.i=@darbyshire-bryant.me.uk header.b="fXFpxTOr"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zJ0kh5hJ1z9sQm for <incoming@patchwork.ozlabs.org>; Fri, 12 Jan 2018 22:24:12 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=HzbxEMIPAoA5EN4yEhZmY5jB9h3TerLJd7MHuibbb94=; b=Kb5GSlfpX0/4b4 J5pVIwxy4pCpi8U4NLCGSIkSVAIJcPeVjZlUx0w0gRJUUXpKlC3CGAAsYcxzvjJbl4rCoUbfS0bhz ktesdYkcnAw+FXZzelWmib+nlMuue6TgdaiV4rwEFFECMAmYJOHx6XmrJAtrH1khwznTR2O1LXyzk bKm+k14S1haFzc6B6koR6YPniOHMw9JUTJHHjta+4GKVnIj46NKx1s84nt+Buz9gJg9VWtzkgUCqW lj27gQiIM0262MXJo2PO+uGFU5xoGqTDsvOdMTyHk8UZqHdm0Q2+k1Sxf1pCg1FgZu+0WRnY3qop5 fBJbq1gAntmcBivcSONg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eZxRM-0003tJ-3T; Fri, 12 Jan 2018 11:24:04 +0000 Received: from mail-he1eur01on0041.outbound.protection.outlook.com ([104.47.0.41] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eZxRI-0003s9-OP for lede-dev@lists.infradead.org; Fri, 12 Jan 2018 11:24:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=darbyshire-bryant.me.uk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=gYHjugZh1QaeuUVTPKUsmG8ypCyo3nWOPMLD8c+cB3k=; b=fXFpxTOrBFzyXUp8mkNeQvam5Cm22Iui8qPWBXsGNT6/oidl17LZIKpY+xs4dbgpDr/5ruDLfkGHAixPIQMs74o69WXBfchNbUIvOaPH3aEtrGRRtC6CzT0/iRjMEwjkKPczkFseQLRWKrCsfSXbaDPuFTbIBSUUDLn9vQSS2m4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kevin@darbyshire-bryant.me.uk; Received: from Rowlf.darbyshire-bryant.me.uk (151.227.238.51) by AM6PR0702MB3734.eurprd07.prod.outlook.com (2603:10a6:209:12::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.1; Fri, 12 Jan 2018 11:23:46 +0000 From: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> To: lede-dev@lists.infradead.org Date: Fri, 12 Jan 2018 11:23:41 +0000 Message-Id: <20180112112341.31116-1-ldir@darbyshire-bryant.me.uk> X-Mailer: git-send-email 2.14.3 (Apple Git-98) MIME-Version: 1.0 X-Originating-IP: [151.227.238.51] X-ClientProxiedBy: VI1PR0802CA0026.eurprd08.prod.outlook.com (2603:10a6:800:a9::12) To AM6PR0702MB3734.eurprd07.prod.outlook.com (2603:10a6:209:12::12) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3c0a175e-c8ea-498d-0320-08d559aef285 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020081)(4652020)(7021111)(5600026)(4604075)(4534111)(7022111)(4602075)(4603075)(4627207)(201702281549075)(7048111)(7024111)(7027111)(7028111)(7023111)(2017052603307)(7153060)(7193020); SRVR:AM6PR0702MB3734; X-Microsoft-Exchange-Diagnostics: 1; AM6PR0702MB3734; 3:u2Ug8M62HXO0d5rwnX9kbfD0XDPTWMZVQlkpPerxE+HyCDI/7f44dk1KIPOVl14UWLcN2/ZYH7qwU3zpUS5L+UyKnwOSqWYjjvyRyDaQ6I9YPnf2jFXEQoGNyQ1gv1P80zo/b+fsXzUq+48j1QB6Jn4blNYWjLrIU95jDI4ve4JJpI1P3NMVAg5llGkg4afL5KwZDM9cusOpZTtfR5nBp2WHM9+2qajYSjAmoLaNL1E9cjyaW9Sw+cP8Fpm3EjVN; 25:rw4eCoEPPz0nOcSfdDZd0xmXBeZJR9yPOIKhBb4drir+8eDWLecw2icjttav+nXUZbEGcaRXoPJOQSlNdSFYbK2qmJ7W9oxqXVRbVDdxPjAXNTLKff8e6tPIwS6hz9TErFphvVGCgfCjjlSGwYiKdT2SmvKp/PG5pqEOMpmjpiA7YSXE6C9EZo01yjhqXJ0S6PDm27MP7rJa6PSa8uC6/JRiZU1QIV15YPEt+oegvjFOWOy0oWbkFKsTCp7+PSIn92286+L/vueFlN1NCfaIO2EPzF/LqoGebbaxs8JgFaCKDL8GozGcCMQH/M+4N9EUPt0kYuYnP+PrjIS1Z+sBOA==; 31:Ep/8kcIzejV73aNsj6MqJhGmr6pOXwfw07f7qeZR3IncOG7j4Qy6NpoAuj8zKVv57zBx1etCiiRFqYcsYedPg4qPcLesd34od/BJmn6/GFvT8VsR2ZPqk+PRz3aiIuWjDARU2NBrtXfog5cev7YMVhWMsjHjpFoxiY643jZtFouQAK9bPqK3+alyqMy14wemFUKxrNaBj/Q049+8p0I4Kj6XbsUddtjGjWgJeImZRcE= X-MS-TrafficTypeDiagnostic: AM6PR0702MB3734: X-Microsoft-Antispam-PRVS: <AM6PR0702MB37347172E67E266BBFA6A316A5170@AM6PR0702MB3734.eurprd07.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3231023)(944501143)(3002001)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(2016111802025)(6072148)(6042181)(6043046)(201708071742011); SRVR:AM6PR0702MB3734; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:AM6PR0702MB3734; X-Microsoft-Exchange-Diagnostics: 1; AM6PR0702MB3734; 4:/jvavWJtrCLbY7lPEAfMt9GzH2Qo/lP2qd87af6CsDA8hMZLRZFmSsdaCzo60MOA6FW7DH40nu4dHe4CZU36hjrdVpAdwgutcYlh8PtkNUlF9u0pqPpqNCecbRZy8OgbscSU7OUtq38uynbPqfN1EZy1u+DqMVrMmYiPPXJN0488VOO6nUMpektFho/EtNAiAtQTEWx08pv73PA3iJIzL8rH8pAhllfgaWw8/fWWltsfTkEobFDhuwOzc65KE5ZYQARRYClLZRBQDDcobf2ibg== X-Forefront-PRVS: 0550778858 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39830400003)(346002)(396003)(376002)(366004)(39380400002)(199004)(189003)(36756003)(386003)(66066001)(97736004)(52116002)(74482002)(48376002)(4326008)(7696005)(81166006)(16526018)(50226002)(2906002)(1076002)(51416003)(6486002)(16586007)(53936002)(81156014)(8936002)(59450400001)(50466002)(2361001)(47776003)(2351001)(3846002)(478600001)(105586002)(305945005)(7736002)(69596002)(316002)(42882006)(6916009)(8676002)(6666003)(53416004)(25786009)(107886003)(106356001)(68736007)(6116002)(5660300001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR0702MB3734; H:Rowlf.darbyshire-bryant.me.uk; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: darbyshire-bryant.me.uk does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM6PR0702MB3734; 23:dD/ym+JyRwE8fCEkfCjecqMbATf018p0CsyKgPg?= xNyKHQeeRo/88CTx3UbzheK9dZCG0lCxrbFZC47TY7mgPElFmM9kzWJnedKrAjSiEeP/AvjFo9XcpPp7dxyvox7SHPPZuMWrB/dyYOADiK8fG82BMTHrJq8jAGtYDnQIh7rt4nJPxYxd/Gm5kHX6L2aLuOvPmFN98CFWmA54+ilZNWUNNOOx+PYK+QTUxzspdkKXXQDzmk+YAqEdhV9sfhY9ucj+QN7DuYElLgF1XyytS3wabyozpgsxCfMFd/U9J/CRDI1JTg95gh4RIulRtCs6ekFMSWesIeL7kik6P3Hb8uhW48SWvGeUBRDVKcKYTwnedLwNiVLXpr/YdWc/E9Vuz7mjcufF2PPlWuncsdd5NQlwnedweqLdfp5/vLVxqpadqlz9JShW0KdJ8EpdJd+OIMZzNWwqYJru27fAP/tcvG/P94hpYMBcgpSDXuiemc0utAvmyL8M7AUwV5DFR5V4I1IjF3xQL33Do/5ZvFBVtiCmZ5iNth8d7REfZTVGpQqwq6pJNUFuIAKd4ddcLiSG/OfvAom9bVbtY7z3cN/pl4uyw+m4O78oyBuTQk6fWb8ZklEYyPITbcEQKxjGZaGAc9ghx1PXrXwuN6779VJ1ONXVtb5l7lHOqpiv5nV2tNcxsAzWxzpQKgrAG2Ak2kch19GzH6eFi8AQUtCbRPmmb0eh9DFmRxMnVwzCpJB1aqtE7a9e9radlihrGbzBkA3lCO3gTz/KgjxCUt1h30OzAIeLb3uEWYBh46W9QFzgu408tq1PH/IVoKr1ku4Qw+B4K87fTP0YrnVQXmdthyfn3VXwTJAjPv8zVRNuHj6jupWcV+sRkhiis2rfqjH/LcfYeYjmL2T1DDWQxmcspixUwWbCZak0g/lcW9VracE+Hz19QMNE1wzTeVjTL6HT4/+77f3Kc3yGQsHdpIc+CW9/OaAUJHv9ABYJ6mTf2qU8tcOwQGP5zXNb+mTX6fvJBouLAU37hUStRT2vEnVe6rPoJZqlja4wzYuQa9+pM4j3w4pACzfXuNIISI+O1innOqCX5zh/2xZG16mYxPn2Jw9Rjav2itXoSCrbSGawYC8auP1l4AQ6J/phneLfXXBJF3oErqz4j8WMpgd8oAz7r1CIrFCehh0SQIvav880Kmc1Gv2Q= X-Microsoft-Exchange-Diagnostics: 1; AM6PR0702MB3734; 6:tfFrO9t+f1ZmM3TFuqh7gl59FkGRDYh3QuEne8gmeYW7zAiL3mZLzg5tu3W9PWYPwZiExfnPzHbOD04nQ9OpRLVE3F6dfkfc9CB0B3gV5D4p0g3Zm9mmeQBmiFZOmrYbE2htw0dUfoDOeWX19+KHGf3SxWqluDvnRDbY7AlA9dyVqRkdbtbj2eGBiAQC2xaOsAULHIj2PU/d7RzCpGZI7KF2YwSiuHRsTvZ/ItxCkRg2JriBcyZL5GOOjZJSRitp5+45Ene5upnf9yoHv/+c0q6T/p6zg3AymzI5JPyfJtjBUReivBOIuBSiHmY/EGRPWWfI38BvIGr0m/sY/TFg6VPBvjdgPRhHoGhixddMpqI=; 5:Ip8foUsGWE/ndsKdv+wgPsGggpHiMeN23jvCj5R11bM8fNFc4VInTP7OqEBk7IyFOoosAj9mDh18AfHp53cYJKPdfwhFZcQy7hRu+kUP/oOqCXcPg8Qb+4ichFVaJ9U1hPN7UNr57vHnijOKVUEubVWsgmjdVOl+q8IrkMkBRXM=; 24:C8UwNv+Usqosc7QiN7J8k40cFgxPqpZ54klS1m15m4GxAk9MGK3zsupt2IwFMHHNlCR0R+aRrLcOgZvMDL3AbZ7nOaMhhMSFHdRxggLwVlA=; 7:dA3PDMWvddtvK5NIpp1sZ9yYRn0CaIiFQseBhfSQvBPPiI9hGIswlXIslVHlN6MQ6xrP8+lOwLLYmhYNsLUmQs4M0wz7rYv2c29nVpr7DKi3I9pzFif6VMnCQSmH0b2WPFilVCOa73OFSrH6TBiW328dh+ya0+elNfrT3bwLWcGgsQvDFxRTZcR+BsMBOGQUH7YGJc1xtYsU3PHpABCdIY31zPTj3hBSujRgDBejY9aoWVNz7pZ7SJM2GCQpkSxO SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: darbyshire-bryant.me.uk X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2018 11:23:46.8746 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3c0a175e-c8ea-498d-0320-08d559aef285 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 9151708b-c553-406f-8e56-694f435154a4 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0702MB3734 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180112_032401_024860_BE807CCD X-CRM114-Status: UNSURE ( 5.56 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [104.47.0.41 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [104.47.0.41 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Subject: [LEDE-DEV] [PATCH v2] base-files: sysupgrade: correct command help text X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <lede-dev.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/lede-dev>, <mailto:lede-dev-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/lede-dev/> List-Post: <mailto:lede-dev@lists.infradead.org> List-Help: <mailto:lede-dev-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/lede-dev>, <mailto:lede-dev-request@lists.infradead.org?subject=subscribe> Cc: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Lede-dev" <lede-dev-bounces@lists.infradead.org> Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org |
| Series |
[LEDE-DEV,v2] base-files: sysupgrade: correct command help text
|
expand
|
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 87e02ff7d2..0055474166 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk include $(INCLUDE_DIR)/feeds.mk PKG_NAME:=base-files -PKG_RELEASE:=182 +PKG_RELEASE:=183 PKG_FLAGS:=nonshared PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade index 3fd612c375..c747c4eaad 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -55,7 +55,6 @@ Usage: $0 [<upgrade-option>...] <image file or URL> $0 [-q] [-i] <backup-command> <file> upgrade-option: - -d <delay> add a delay before rebooting -f <config> restore configuration from .tar.gz (file or url) -i interactive mode -c attempt to preserve all changed files in /etc/
Commit 30f61a34b4cfd2c676fea4a919e089d6a77254e9 claimed to drop -d & -p options. In reality only -d was dropped. Update command help text to reflect that -d is no longer a supported option. Fixes FS#1187 Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> --- v2 - remember to bump the package release this time! package/base-files/Makefile | 2 +- package/base-files/files/sbin/sysupgrade | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)