From patchwork Mon Oct 24 11:27:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10305 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp655094wru; Mon, 24 Oct 2022 14:14:18 -0700 (PDT) X-Google-Smtp-Source: AMsMyM47Ey/FQfi2pc4y5uPEQOg7FSVEU2FVklosockoHa61Ey+OBjzqrioRMh9wx6PkbpXy+ViK X-Received: by 2002:a17:902:f64d:b0:178:a963:d400 with SMTP id m13-20020a170902f64d00b00178a963d400mr35754711plg.6.1666646047795; Mon, 24 Oct 2022 14:14:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666646047; cv=none; d=google.com; s=arc-20160816; b=1H/msBVgfi/9nQtC5y7C6ZYZ2BLqaOpWBbIWLDlsgoy6NWUt9UDiDWG/P5x0fi7hyn Fy2IDLJLlkPeyidQy4nOC7JJv2MH219GcwtgaH++cGhh+JwwCAm1W1SKyQAmLdvcV4YF EXerNrXha/Xe6PpQaluNElPwPXVnUsWt4A5h98V3IXeftP21Lwl9kEDcdEKTH2dbjMNE yb+5i2FHL8jk373FXQMWU7Z51abSIagaKL3uMPyOPFsVNw/beNLrjnrvBSd1QDk+cnDS mYbnmP24yPXh4cYXVaP6tSFAm5MQCDtt1jiDsQNpjFHbTnxWt52mF770YPJPL7BkyTzt emaw== 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=mRPAaUp2/5Fc8twuGadX9SypWuJAUehRHmdyN3BZfoOJtTSQrlqzzHEVagSIAPSpgZ sbRAHDmCk6URdQBcISJDMn14J29yTsu4LHTo8irvokqSfZLNindpPm/pG49lJE1iXn2G Ko8bCf+QdSOEEoi3l8P0Ww8IoJj9CSpWl1Sx1bV7n8cxjSJKVONaFOphbxvF9vrBNoMr IKepWcCCyaLt86C/bY2XAIbxrNiu9Erz6npcfwDRV08lb0Zf75XjXYgnfvrk3Scx8D2i JjCYcV3u3VVowUEzJGBddMtb5pEEKmQdPG9db38m4asBPOo4U8NePOZ6fyKDu2B1yN72 anUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iRWckKq9; 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 187-20020a6205c4000000b0056187ae2798si684468pff.179.2022.10.24.14.13.54; Mon, 24 Oct 2022 14:14:07 -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=iRWckKq9; 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 S233406AbiJXVM0 (ORCPT + 99 others); Mon, 24 Oct 2022 17:12:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230336AbiJXVLg (ORCPT ); Mon, 24 Oct 2022 17:11:36 -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 630C92CF4B9; Mon, 24 Oct 2022 12:17:55 -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 70F13B818ED; Mon, 24 Oct 2022 12:40:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CEC36C433D6; Mon, 24 Oct 2022 12:40:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615214; bh=QOgwnGXtJ5WnEebGLcaB/JmKLZooNWI4me6Yyig3MGY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iRWckKq9EnFrLYDrC9GJuEKNbFu2r0czBkpMruu5cF+43M//pVLghWgIC2JP7swHf GgCyD+kJ1nFBTXFCiY2zlwv63iHT62DNWBdo1uNsavJNOJJOSO7RJIgXbzcTMOa9Nf bpLn5com/5n51xFU8nOfbfVrrxx4NM1QP2fATgU8= 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 5.15 135/530] selinux: use "grep -E" instead of "egrep" Date: Mon, 24 Oct 2022 13:27:59 +0200 Message-Id: <20221024113051.162387424@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 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?1747605046420433845?= X-GMAIL-MSGID: =?utf-8?q?1747605046420433845?= 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