From patchwork Mon Oct 24 11:29:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8899 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp433883wru; Mon, 24 Oct 2022 05:50:48 -0700 (PDT) X-Google-Smtp-Source: AMsMyM464kVZrWj4x9enga6JdQ2f0WGp+n2Vs0x9a/GfJldCSVqhgSQghL+ElT0H93zp/kSEwpsh X-Received: by 2002:a17:902:f54f:b0:186:a987:c733 with SMTP id h15-20020a170902f54f00b00186a987c733mr5050172plf.170.1666615847934; Mon, 24 Oct 2022 05:50:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666615847; cv=none; d=google.com; s=arc-20160816; b=mCzZ2ImucfdvQpWN/ch7T60hNLfD+wItapxhuIeMAXpPk1AMif90+YGrCe8UnPwtV1 NdGd4e12gSmI//wG3rMvTf9vvPcn2HcNNUngcrOyIXkJ6ujDTIbFc0+VSD6Zb6FK0UfH 99A/MkAZ59kRlYjtdzWB5RXfMeOHPXOZNOudljzwnPX0pi04ce2mNuSxixgZ0WjDmD8x sUYjw+668phxqwIWruiXFUrAf+RLHN2fx9mrYLVpJncNh+G39yjDCAu8uCJSUjA8z13r uozsCmAJ8U0QIsmCFC1IbKbX+yzYChfRjVXHqkK8obf/FTY0hZWlOYGK7TvtTnkMu17c Ae+Q== 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=jnWMuPCU8uyySHP+6DHeVtIoNznpwKg+AuAtiDd88jIAF9t1Q1usyXcNh+q75zAJDO T29Oa9zRl+3diKQjPWTd+tTaeOJx8vMNvEoGF2yDvOH8SS7PMgzdUgJnwVSS0AbN4x1R 0h4QQ+excmBV4ZuT36h9ZAN+19FGCt4XMuN17U82M/k7rKUqklU8sUYoM/KvykJ33fyn Jw0O4/5UGcgQqx0v1/FU9ZBdH/wesKA3L/66uTyQYc82oR8kwR5c2iGnypDY0ClfvZOw R81+KJrAMVN9hk6sKVThawZNskQZj+bnlt+4CgC1e53sXQRo+Mx2+QK61J33BPb8gt13 xecQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=D+fkqKfq; 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 ot1-20020a17090b3b4100b00200acd39846si21043656pjb.63.2022.10.24.05.50.32; Mon, 24 Oct 2022 05:50:47 -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=D+fkqKfq; 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 S234753AbiJXMtZ (ORCPT + 99 others); Mon, 24 Oct 2022 08:49:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234453AbiJXMox (ORCPT ); Mon, 24 Oct 2022 08:44:53 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 588F426E9; Mon, 24 Oct 2022 05:09:26 -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 dfw.source.kernel.org (Postfix) with ESMTPS id CED84612BC; Mon, 24 Oct 2022 12:07:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DDCB3C433C1; Mon, 24 Oct 2022 12:07:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613274; bh=QOgwnGXtJ5WnEebGLcaB/JmKLZooNWI4me6Yyig3MGY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D+fkqKfqeBTuIiYaO419A0VL/7ptoBjCeEN3b/zaZAMaPZmkk1yca6C7ixzqLsUXX L0Dtd8BqKCkjBqkjMoF0MQMniyv+8infDquMkezVaCSMInY+vXgg1y86lFqSOsIYSm bq3llWmkc13DukUpBwAEPDk3HHtxZZPDXGmWlIRc= 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.4 057/255] selinux: use "grep -E" instead of "egrep" Date: Mon, 24 Oct 2022 13:29:27 +0200 Message-Id: <20221024113004.394129391@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113002.471093005@linuxfoundation.org> References: <20221024113002.471093005@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?1747573378865164241?= X-GMAIL-MSGID: =?utf-8?q?1747573378865164241?= 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