From patchwork Wed Oct 19 08:24:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 5117 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp251024wrs; Wed, 19 Oct 2022 03:50:38 -0700 (PDT) X-Google-Smtp-Source: AMsMyM64fh1RzWMkPw3YXIfeJ/JM1g5LjPd5pICpQPQb0U7gA0XszuvrFITfnPfe1g1vODnpEzL/ X-Received: by 2002:a05:6402:2552:b0:45d:ecf:b23 with SMTP id l18-20020a056402255200b0045d0ecf0b23mr6799241edb.255.1666176638313; Wed, 19 Oct 2022 03:50:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666176638; cv=none; d=google.com; s=arc-20160816; b=P5qZQZXb3VmUusUYfb+RA205tiZzH+lIVpIJ+5DINOfOUapJvnJuZaIQPFRMCyEW8m AKNwrI6snQtIPWvflBjvyJ/ITjKt5UWPcWV7CQdNJBIHUg5rDdVYWcFML7JJiyIu2Twi w0snbCNmbRaEu5HAivwPVt0eUKI96m/XZ541mpXLVpeyBW9l/aPqAIoqo899vB5g0e0r 4wgwg2BQXTnRGZBgZc+O97nXHEDXrG8ObOL5T+82dN/POFuked6tsvX/Ru1Cvj3mbRHh Wwoz6+H8rQPyHddEitW+e2XkN9skrb7Q4Kw1CUHon2LsbiihMJxQ8F7MyGOH1w2MWJto RGVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=YCRKJCfcbu79sBq4qIZn4FIjwAspe2hJvwsrrGU6Z2c=; b=GMMAD+HEara02fHegH3f5kNq/NslRKN5d3TpR7UQGRyULY3BNbOcCJEkXt9qKxNISw exB9Gi1Q92iFFp923mwi8rqFYk9A1SIcqmtzcdxAesuEHlQ9iiPOkrJJMk318O29S5k1 XL1FYNA87UNKmTUiqZBKGNsAGuaoEhFE/skkyyzy/nd8hSatZeLoifzqSRBg1fn95qZ5 Ym6ffPdfZh0AK3LAdO1xXAEzyv1nLLPWWoDWfaxlTWWpQpApHU8Z91N3sjgkz71z1+RH lYcWz68Loaw82ECe6WFx2qf+Rky5FHARlxP/AHYMwRYYY1kp3ShYWtepFQA9Y0MRAt/E HB0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=VDJGp1yC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m23-20020a1709060d9700b0078bcc872a6esi12087021eji.360.2022.10.19.03.50.14; Wed, 19 Oct 2022 03:50:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=VDJGp1yC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234416AbiJSKtB (ORCPT + 99 others); Wed, 19 Oct 2022 06:49:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233482AbiJSKrA (ORCPT ); Wed, 19 Oct 2022 06:47:00 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B3FA15B119; Wed, 19 Oct 2022 03:21:51 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 1038DB82319; Wed, 19 Oct 2022 08:47:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 694F9C43145; Wed, 19 Oct 2022 08:47:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666169227; bh=QOgwnGXtJ5WnEebGLcaB/JmKLZooNWI4me6Yyig3MGY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VDJGp1yCB7sK4rYe4cy80fPUXTGGI1aLRPhbIx4mJ1KpEGrHMrNTmFuUVIqTNeJdT ZekDH3sC8zDcCt+GnHzsC7eRF2s6mGlU73w6Qd2n8mdOF781Q/pPueeYhiqyXncnCS ++8Wv4aQ/0HAkNgYN9IKx343cBi/B4AObG0sL+MM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Paul Moore , Stephen Smalley , Eric Paris , selinux@vger.kernel.org Subject: [PATCH 6.0 202/862] selinux: use "grep -E" instead of "egrep" Date: Wed, 19 Oct 2022 10:24:49 +0200 Message-Id: <20221019083258.934931280@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747112834739844117?= X-GMAIL-MSGID: =?utf-8?q?1747112834739844117?= From: Greg Kroah-Hartman commit c969bb8dbaf2f3628927eae73e7c579a74cf1b6e upstream. The latest version of grep claims that egrep is now obsolete so the build now contains warnings that look like: egrep: warning: egrep is obsolescent; using grep -E fix this by using "grep -E" instead. Cc: Paul Moore Cc: Stephen Smalley Cc: Eric Paris Cc: selinux@vger.kernel.org Signed-off-by: Greg Kroah-Hartman [PM: tweak to remove vdso reference, cleanup subj line] Signed-off-by: Paul Moore Signed-off-by: Greg Kroah-Hartman --- scripts/selinux/install_policy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/scripts/selinux/install_policy.sh +++ b/scripts/selinux/install_policy.sh @@ -78,7 +78,7 @@ cd /etc/selinux/dummy/contexts/files $SF -F file_contexts / mounts=`cat /proc/$$/mounts | \ - egrep "ext[234]|jfs|xfs|reiserfs|jffs2|gfs2|btrfs|f2fs|ocfs2" | \ + grep -E "ext[234]|jfs|xfs|reiserfs|jffs2|gfs2|btrfs|f2fs|ocfs2" | \ awk '{ print $2 '}` $SF -F file_contexts $mounts