From patchwork Fri Jan 22 08:26:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Bittorf X-Patchwork-Id: 571571 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 A91301402DE for ; Fri, 22 Jan 2016 19:27:17 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bluebottle.com header.i=@bluebottle.com header.b=gqTWY9iZ; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 3223B2844F6; Fri, 22 Jan 2016 09:26:24 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RP_MATCHES_RCVD,T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 35DDB281584 for ; Fri, 22 Jan 2016 09:26:19 +0100 (CET) X-policyd-weight: using cached result; rate:hard: -8.5 Received: from mail.bluebottle.com (mail.bluebottle.com [176.9.67.91]) by arrakis.dune.hu (Postfix) with ESMTP for ; Fri, 22 Jan 2016 09:26:19 +0100 (CET) Received: from localhost (p57AB070B.dip0.t-ipconnect.de [87.171.7.11]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: bittorf@bluebottle.com) by mail.bluebottle.com (Postfix) with ESMTPSA id 391F91F080 for ; Fri, 22 Jan 2016 08:27:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=bluebottle.com; s=fe0; t=1453451220; bh=c2kERMBAWDnyHaMI2Vwn6JypFWSR3ShdT7EJb7GI70c=; l=1043; h=Date:From:To:Subject:From; b=gqTWY9iZGzV+rxbfynwpzp6DI8oRV0OQp+mTGOqC4UsgmWQ42g1GcAb/QeuETbQw9 pSdq8WpZaoapb1KPegT9CM9ghIq5pzEaGiZ8twh8pHO4S2edXXF+1Z4W39KRVOXzuo +UVCkD67AUBbISnexsvHWtwirmOwxuetiVCJZP+8= Date: Fri, 22 Jan 2016 09:26:46 +0100 From: Bastian Bittorf To: mailinglist Message-ID: <20160122082646.GA8681@medion.lan> Mail-Followup-To: mailinglist MIME-Version: 1.0 Content-Disposition: inline X-Editor: vi http://ex-vi.sourceforge.net/ User-Agent: Mutt/1.5.21 (2010-09-15) X-Virus-Scanned: clamav-milter 0.98.7 at fe0 X-Virus-Status: Clean Subject: [OpenWrt-Devel] [PATCH] base-files: fix sysupgrade 'wget' handling 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" with r48379 and r48386 the path of wget changed. respect that and adjust the dirname. this fixes #21680 Signed-off-by: Bastian Bittorf --- package/base-files/files/lib/upgrade/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index 761b4c1..adf290c 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -48,7 +48,7 @@ supivot() { # run_ramfs() { # [...] install_bin /bin/busybox /bin/ash /bin/sh /bin/mount /bin/umount \ - /sbin/pivot_root /usr/bin/wget /sbin/reboot /bin/sync /bin/dd \ + /sbin/pivot_root /bin/wget /sbin/reboot /bin/sync /bin/dd \ /bin/grep /bin/cp /bin/mv /bin/tar /usr/bin/md5sum "/usr/bin/[" \ /bin/dd /bin/vi /bin/ls /bin/cat /usr/bin/awk /usr/bin/hexdump \ /bin/sleep /bin/zcat /usr/bin/bzcat /usr/bin/printf /usr/bin/wc \