From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 421AC21942349 for ; Fri, 7 Apr 2017 08:22:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491578552; x=1523114552; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=FPQkWrj8czHkCZAshK/S8mxFDRstEthEgVaQUu/kyw4=; b=dfj8AUTgoL5ChbC1UMdy2j1QxS1kSJ7gtSvuLpsnfzuHCVTdNDxrJxnx UZC6GnDWR3bLU3z65OqOYWXeOcMpWg==; Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Apr 2017 08:22:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,165,1488873600"; d="scan'208";a="1116972558" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by orsmga001.jf.intel.com with ESMTP; 07 Apr 2017 08:22:31 -0700 Received: from fmsmsx116.amr.corp.intel.com (10.18.116.20) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 7 Apr 2017 08:22:31 -0700 Received: from fmsmsx103.amr.corp.intel.com ([169.254.2.246]) by fmsmsx116.amr.corp.intel.com ([169.254.2.225]) with mapi id 14.03.0319.002; Fri, 7 Apr 2017 08:22:30 -0700 From: "Carsey, Jaben" To: "Ni, Ruiyu" , "edk2-devel@lists.01.org" CC: "Chen, Chen A" Thread-Topic: [edk2] [PATCH] ShellPkg: Fix Shell to not return without startup.nsh after timeout Thread-Index: AQHSr0ugFbfo9WpQtEWW2Ob3A/cSRqG6BvAA Date: Fri, 7 Apr 2017 15:22:30 +0000 Message-ID: References: <20170407030341.245636-1-ruiyu.ni@intel.com> In-Reply-To: <20170407030341.245636-1-ruiyu.ni@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNzNhNmI3YWQtNzRhZC00OTI5LWI2YTYtYjY3YjdjMzY0OGM0IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6ImtqUVBEK2s0Qzlqam5xRFduQWpzdld5SHl2RzVcL2JTeURIOXBDMnZUSUlzPSJ9 x-ctpclassification: CTP_IC x-originating-ip: [10.1.200.108] MIME-Version: 1.0 Subject: Re: [PATCH] ShellPkg: Fix Shell to not return without startup.nsh after timeout X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Apr 2017 15:22:32 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Jaben Carsey > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of > Ruiyu Ni > Sent: Thursday, April 06, 2017 8:04 PM > To: edk2-devel@lists.01.org > Cc: Chen, Chen A > Subject: [edk2] [PATCH] ShellPkg: Fix Shell to not return without startup= .nsh > after timeout > Importance: High >=20 > When user doesn't press key to exit the timeout waiting in Shell, > and there is no startup.nsh, Shell exits with failure status. > aaf51f08ee104447207bba571649556095befc93 introduced this bug. > The patch fixes this issue. >=20 > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ruiyu Ni > Cc: Chen A Chen > --- > ShellPkg/Application/Shell/Shell.c | 5 +++++ > 1 file changed, 5 insertions(+) >=20 > diff --git a/ShellPkg/Application/Shell/Shell.c > b/ShellPkg/Application/Shell/Shell.c > index e91b964..4383298 100644 > --- a/ShellPkg/Application/Shell/Shell.c > +++ b/ShellPkg/Application/Shell/Shell.c > @@ -1279,6 +1279,11 @@ DoStartupScript( > if (FileStringPath !=3D NULL) { > Status =3D RunScriptFile (FileStringPath, NULL, L"", > ShellInfoObject.NewShellParametersProtocol); > FreePool (FileStringPath); > + } else { > + // > + // we return success since startup script is not mandatory. > + // > + Status =3D EFI_SUCCESS; > } >=20 > return (Status); > -- > 2.9.0.windows.1 >=20 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel