From patchwork Fri Feb 2 00:57:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 868488 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: 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=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Nm79QHil"; 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 3zXdrq26wXz9sR8 for ; Fri, 2 Feb 2018 11:58:19 +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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-ID:To:From :Date:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=7t2EkCdME6NF561P0lc5mliYnrVCY91exqEjWtgVEVc=; b=Nm79QHil7kSLPa u63dx7VjbioRIl46cn3Gb1yKVjehHuDcWOyTDf26w43g8ge/t7QdhRqLK+hMC4zkhRIBqjP6UHJvm vbyK2XL/JtFdtfLwxNgYB1/JsRPCeV3bdri3bfDlz7nvlzDKGr1cYgNnbqEZLKgVH0DZbufu+Zfm9 +0B8CNWoZGMvyKp4pbSUBY+WcYwXKsLTkr7H848hnoDrfB68l+zNNZB6l9cPESKNc7yBEMLyvnzrb RwfAJCBzb+e5giLpoToXvKrrSOgF2o1aGJhnGYPUaHhQCdrOTfFPTbtCEEj31F95tR2XGO3vgRjIl 4gOAbJH791Oryj5ZCzUw==; 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 1ehPgC-00057m-Oc; Fri, 02 Feb 2018 00:58:12 +0000 Received: from fudo.makrotopia.org ([2a07:2ec0:3002::71]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1ehPg9-00054P-AF for lede-dev@lists.infradead.org; Fri, 02 Feb 2018 00:58:10 +0000 Received: from local by fudo.makrotopia.org with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) (envelope-from ) id 1ehPfs-0007an-Qw; Fri, 02 Feb 2018 01:57:52 +0100 Date: Fri, 2 Feb 2018 01:57:46 +0100 From: Daniel Golle To: lede-dev@lists.infradead.org, openwrt-devel@lists.openwrt.org Message-ID: <20180202005740.GA4414@makrotopia.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.2 (2017-12-15) X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Subject: [LEDE-DEV] [PATCH] base-files: quote values when evaluating uevent X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org When sourcing /sys/class/block/*/uevent values have to be quoted as they may contain spaces (e.g. in PARTNAME). Fix this by pre-processing with sed before sourcing. Signed-off-by: Daniel Golle --- package/base-files/files/lib/upgrade/common.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index 71cffc8587..616131c89c 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -134,8 +134,7 @@ export_bootdevice() { esac if [ -e "$uevent" ]; then - . "$uevent" - + eval "$(sed "s/=\(.*\)/=\'\1\'/" < "$uevent")" export BOOTDEV_MAJOR=$MAJOR export BOOTDEV_MINOR=$MINOR return 0 @@ -150,7 +149,7 @@ export_partdevice() { local uevent MAJOR MINOR DEVNAME DEVTYPE for uevent in /sys/class/block/*/uevent; do - . "$uevent" + eval "$(sed "s/=\(.*\)/=\'\1\'/" < "$uevent")" if [ $BOOTDEV_MAJOR = $MAJOR -a $(($BOOTDEV_MINOR + $offset)) = $MINOR -a -b "/dev/$DEVNAME" ]; then export "$var=$DEVNAME" return 0