From patchwork Thu Aug 15 07:18:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Kerr X-Patchwork-Id: 1147438 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 468Hqt2hP6z9s00 for ; Thu, 15 Aug 2019 17:18:50 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=ozlabs.org header.i=@ozlabs.org header.b="cBA2Mihh"; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 468Hqt0ZB9zDqwy for ; Thu, 15 Aug 2019 17:18:50 +1000 (AEST) X-Original-To: petitboot@lists.ozlabs.org Delivered-To: petitboot@lists.ozlabs.org Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 468Hqm1WW0zDqvh for ; Thu, 15 Aug 2019 17:18:44 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=ozlabs.org Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=ozlabs.org header.i=@ozlabs.org header.b="cBA2Mihh"; dkim-atps=neutral Received: by ozlabs.org (Postfix, from userid 1023) id 468Hqm00w0z9sN6; Thu, 15 Aug 2019 17:18:43 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ozlabs.org; s=201707; t=1565853524; bh=JgLle1hur/6xPOUjsBG0/fHfoQISBACCKTu3LgI84F4=; h=From:To:Subject:Date:From; b=cBA2MihhBA5WO/WpA6HsldZaaNHZ899vGmfR7YHJeJEI9aIoepvFpb2/ef5KDehoG AMqlbdd13KSvTIZ5wsYED0nq3bg/9IJWZzNjrZTzRC10HM4IVMdnIenAgRGVcetevd 5J6cpjLptkYSv3pP/1FAs2D6MFLzHl0d7+XQ6bhfflnqPDEIijVb1S/EX2N+72+Kjv WHWiz0X5nc9hkyNEyQDmrE6HgMCIThz6TgBH4w/M4sm2KBpcbjeO9Bjyvtc7Jo57Cc mFpkAHJjt5IOgG8Z8NavbOmU+hVCr/STUFP3Q3F5sVoAXtDvGLdSDveQtHHxa7iwtT iKXaWlmTY/eMg== From: Jeremy Kerr To: petitboot@lists.ozlabs.org Subject: [PATCH] pb-console: don't modify PATH unless it's empty Date: Thu, 15 Aug 2019 15:18:21 +0800 Message-Id: <20190815071821.19956-1-jk@ozlabs.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-BeenThere: petitboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Petitboot bootloader development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Petitboot" We're now running pb-console through a proper login shell, so we shouldn't need to modify PATH, as we expect it to be properly set up by the shell profile. This change removes the unconditional PATH modification, so we only set a basic PATH if it's currently empty. Signed-off-by: Jeremy Kerr --- utils/pb-console | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/utils/pb-console b/utils/pb-console index ab5eaaa..845f3f6 100644 --- a/utils/pb-console +++ b/utils/pb-console @@ -119,10 +119,8 @@ esac # we may have been run from udev - ensure we have a sensible PATH if [ -z "$PATH" ] then - PATH=/usr/bin:/usr/sbin:/bin:/sbin + export PATH=/usr/bin:/usr/sbin:/bin:/sbin fi -PATH=/var/lib/pb-plugins/bin:$PATH -export PATH verbose_opt= if $pb_config debug | grep -q enabled