From patchwork Fri Sep 25 19:47:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Darbyshire-Bryant X-Patchwork-Id: 522968 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 62199140772 for ; Sat, 26 Sep 2015 05:48:17 +1000 (AEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 1B9E528C733; Fri, 25 Sep 2015 21:46:53 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAD_ENC_HEADER,BAYES_00 autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id AA45928C732 for ; Fri, 25 Sep 2015 21:46:46 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 HELO_IP_IN_CL_SUBNET=-1.2 (check from: .darbyshire-bryant. - helo: .emea01-am1-obe.outbound.protection.outlook. - helo-domain: .outlook.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -7.7 Received: from emea01-am1-obe.outbound.protection.outlook.com (mail-am1on0069.outbound.protection.outlook.com [157.56.112.69]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Fri, 25 Sep 2015 21:46:42 +0200 (CEST) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kevin@darbyshire-bryant.me.uk; Received: from Animal.darbyshire-bryant.me.uk (151.226.15.214) by HE1PR07MB0937.eurprd07.prod.outlook.com (10.162.27.143) with Microsoft SMTP Server (TLS) id 15.1.274.16; Fri, 25 Sep 2015 19:47:57 +0000 From: Kevin Darbyshire-Bryant To: Date: Fri, 25 Sep 2015 20:47:51 +0100 Message-ID: <1443210471-4377-1-git-send-email-kevin@darbyshire-bryant.me.uk> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-Originating-IP: [151.226.15.214] X-ClientProxiedBy: AM2PR03CA0055.eurprd03.prod.outlook.com (25.162.68.151) To HE1PR07MB0937.eurprd07.prod.outlook.com (25.162.27.143) X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB0937; 2:+3hU7K8ZLf83FaX5usLyxyOOfUJ3kryj3nqAHUOhbG+X+jlGzKuZozjIOQKOgW2iplG4DoDXMF7p7iMrzhqOMjWToDEy30LTdpCC2wyAxc83VxDUB0G9lFXIr/P41lrHD31EaFN8ktz80O8fDwpJZZbqkw1Y83WkoBPzhIUDmHE=; 3:fnYwjizAlly7ZvzveSDtASXtcw8xz4U4OcMag27QiM7h9u84e26OBAJVcyIGrOQE4iLWNibE3YEkiha3r/oVtQAOiK8B9eLtI9N8wFLwGn2DDSSK5rzZVU6wfFMLzqXovOOkHtdaewO5MmKdll1oPA==; 25:0Ib31ODb4loE6EEPwbGlJbHviVsOePGcfi9vWxBmFCTe3RreUzI1s/ZA4s5tzQj5Q0yZgayu8pkTn3yAtU+uFdODuBeE1GpFTYrsK5CErs0ze/8lyY3Yf0qZD/E0xUaAjCcO3IdJazwIagkaXS1UeIzQ7ECAxeUuzvDrJt9iCAb2MWJ/HeYsxHEr01E7TBiitGx+4LvAXF8wYsrp5e28EBTvs/LLQlf/0uVNU7ebBG1oV4yBb0LwSRnSKvM8C7AaaAYMi6N1Ld4Jq5pqtQTSng== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HE1PR07MB0937; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(520078)(5005006)(8121501046)(3002001); SRVR:HE1PR07MB0937; BCL:0; PCL:0; RULEID:; SRVR:HE1PR07MB0937; X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB0937; 4:KHZp4WuIe7IMmYa2OZGTGln3Xni4U62fp2NU9QP/9R38Pej2zUaHdUKuptuynG3V+8AM2V6vnitEngrUI6amD0Co0X7cskH9kQzxqqjo6wASyS9yQkXGYJzjRduywOgXcIzV1BXHf099QZkSEULxMdHRC998sAlCtGp0bvKcYov2gThba96t524Ldj+MzYdzDjVuZUu2QA+NB8Payvo5dDqvCnkO4U9VVgwuZYOHi1fmB+zomE8YgbmkefPdlnMD1iJhppxwfkw2LL2rJuySiEPUEt/2mzq40SNXJU4juwk/+F2n8HJgUzdAAcl5J/eskGyPPyqFjv/ZwGnKE/Ap2KeRjWsWYv/Oqh7IO0m0+ps= X-Forefront-PRVS: 07106EF9B9 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(189002)(199003)(92566002)(53416004)(81156007)(5001860100001)(5001830100001)(229853001)(105586002)(2351001)(19580395003)(106356001)(5003940100001)(97736004)(50986999)(47776003)(19580405001)(66066001)(189998001)(5007970100001)(36756003)(40100003)(4001540100001)(5004730100002)(64706001)(110136002)(122386002)(46102003)(86362001)(68736005)(74482002)(48376002)(87976001)(101416001)(33646002)(77156002)(42186005)(62966003)(107886002)(50466002)(5001960100002)(77096005)(50226001)(450100001)(69596002)(142933001)(4001430100001); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR07MB0937; H:Animal.darbyshire-bryant.me.uk; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A: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; HE1PR07MB0937; 23:IogAPSgIl7hYuAYNJWiEkXgmPSQS3MLIM1waEexAN?= =?us-ascii?Q?KKu7NxCcWCOpdIqOrHw1K6XkZHFIFqTHjMOjZ2Hrrsxb25+Fxt1ibqeUc8F/?= =?us-ascii?Q?0fPdPKZNr4DmFel+2BlfmahqCyYe7GPe+BGLw1W4h9Nv8ft/ywezpevaPuJp?= =?us-ascii?Q?OGHiMg37c5B4Sxo20P7TjN5sa5pAOd/TzQtSrtAMQD/JOVrDKxiiaGhj8CWc?= =?us-ascii?Q?PcWtTwllXO36HIElZSw4FpcPf2C2T+hau5J0xLJ+dG9CSDD0nGnEadj+eC36?= =?us-ascii?Q?P0ENzdQRme07nprLEkgy98yfiPC+3sEFGEkMhavTK3c6hAFQmicGwgqUYZ51?= =?us-ascii?Q?0K43++CBWk4Q0Uzgd+mtA3e15sELs5hzKNOyisAqdb24EI9kIHC5L+Mp8n0k?= =?us-ascii?Q?CE4XaSH6YCOCmXHt84y67XtQRqIYdS8OLh6+24Sm+HQCTho/8dghwsNBK5at?= =?us-ascii?Q?RMzx9HCdzqpd7PIjUIUiZ92Zkz6+xmBC1bKOrEydpNShrSTJZpnmcPcVXzL2?= =?us-ascii?Q?Hp7hvWJZJJhiZHo96FzLIJBrbRHwO+6ojeWuRdn+bU8Mzv7XU8yKulDXG1Gl?= =?us-ascii?Q?mct9038Ujb14bu3XJ8t40TJl+dDckOf4cNfGNnuTDuc3nIFKi4UezeZFmfng?= =?us-ascii?Q?GfRO9o+jufgMGSAryiNS61gno+1VYYXhsVWKx3c2c7XTr2FyJ/MRee4iJlAI?= =?us-ascii?Q?3dbx7wSKnHCitz61GOoBOgAAGyElm9D/t8p153lAFetfv5iVBfkqns5ghuqz?= =?us-ascii?Q?HYsCmw5vn9TECcAlZmuia9x5QaNKRzA+yKRClrU8/hEqCnWIacHKPTBL/Gdg?= =?us-ascii?Q?r6RBFaD2iVPZ9u5/E6KowivWw55fw2w5ufR1rAu8HpOux97fp09FlcZR7sMe?= =?us-ascii?Q?ZmsLDdGw1Fvgyi64DJ7caA9p0ZJz+LwkW7lTfI35iTVnY5iziZS1KNQGK0ED?= =?us-ascii?Q?2a9Hv+OweqVO3NUXpx6mChSZO8AsdzFDYU01GcwP7ONyw1fe9+yB+1Pqr+vf?= =?us-ascii?Q?FidDfVlME3VAfPTFuQ3tkP6S7q67q8ln3RXNZZl1Eh0QoUbwjjdFYN4INGFq?= =?us-ascii?Q?RgbrTqltLHMdsGL+vlnFhEnK4oq6ntaBIwsoWnoq7V0K/G2QJV72W9CcSd/g?= =?us-ascii?Q?zsPz20aOVOgFzoTN5HHUjXA+6eNIjsJeo5MWW/ziwWb+xYM6dqSb25t1bmXX?= =?us-ascii?Q?V6zVaXd9x3CvBXIYKARIK+lDcdMeMHnEtf1XjX1d/5U8S4+bJFAVBjG8DPPX?= =?us-ascii?Q?mP32kIs500jgeElQz41dvgsl2g6ujLLg/7HJCiTHIIkVhtFfgr+JKTBZQJMD?= =?us-ascii?B?dz09?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB0937; 5:TVfCG1qCYuUYypYW1W2/51wwmPvClpqPfNxvWwU1R4bd+hjDJ0bYJrJFAqNDHHkSCocZC6BJYwaYhpJbh8lSb5956snDZT5qvUB5OBzZ1fFoHmIre6LMn+ZPgUPK6iwpwJLHXN/yrVZq3/AvnOzn3w==; 24:RWl95oD3Z51+/OTf45xM64dy2qLFc4oR2W7bf8q1ll95pdXVFguw5vdAC/sjPcTZ4kGGHuHqHYofPuk71hwA1ncAU/y3vb6V08SoS5LCk9g=; 20:OTcWdb2Q4gt2R1pSibhkNTmbCYsJpo8KiL4fgoo53aZfNReD/2LEYFN2Ri7eJsyuFZbER7zJ+GrRCGNjudvrvg== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: darbyshire-bryant.me.uk X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Sep 2015 19:47:57.4306 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR07MB0937 Subject: [OpenWrt-Devel] [PATCH, v2] base-files: sbin/sysupgrade preserve dnsmasq.time X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" dnsmasq uses /etc/dnsmasq.time as record of the last known good system time to aid its validation of dnssec timestamps. dnsmasq updates the timestamp on process start/stop once it considers the system time as valid. The timestamp file should be preserved across system upgrade but should not be included as part of normal configuration backups to prevent restores corrupting the current timestamps. Signed-off-by: Kevin Darbyshire-Bryant --- v2 - original patch generated from incorrect branch and had all sorts of rubbish in it. package/base-files/files/sbin/sysupgrade | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade index ef83c4b..a3400e8 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -142,6 +142,15 @@ do_save_conffiles() { return 0 } run_hooks "$CONFFILES" $sysupgrade_init_conffiles + + if [ -z $NEED_IMAGE ]; then + if [ $(ubus call service list '{"name":"dnsmasq"}' | jsonfilter -e '@.*.instances.instance1.running') = "true" ]; then + /etc/init.d/dnsmasq restart + sleep 1 + echo "/etc/dnsmasq.time" >>$CONFFILES + fi + fi + ask_bool 0 "Edit config file list" && vi "$CONFFILES" v "Saving config files..."