From patchwork Mon Oct 24 11:30:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8638 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp421005wru; Mon, 24 Oct 2022 05:19:25 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6EBvvOkABtxyXVNIgcW/hWEnfP/mP1aF7eCi2FruULPtY27Z5ZYZ/4iwFYcQX6KjzSap4T X-Received: by 2002:a05:6a00:1256:b0:56b:deeb:c5cb with SMTP id u22-20020a056a00125600b0056bdeebc5cbmr3820194pfi.2.1666613965032; Mon, 24 Oct 2022 05:19:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666613965; cv=none; d=google.com; s=arc-20160816; b=mmQyABRIJCMTl7q606A0exS5HqLo5q9RlLq5pp54LenfDaixzP64klj2GzBYMaLnhe ZdC1bUsS6+68tFIHznzpsnXNA0nlvBR+DKvHmxqOgPEfSPSwloEw1dwe+XA4QYmGZE5L ARxsoahOoxlICpwVbQY6Im2lzc4WNH3do0G0fOB1DVy8zTzjIkLNN3pXdkQeqMy8PfXx hMHnZ8iYCEJhI6Rz1ZJqkgM5nNivoUH0eNmgHy7rURmxkxo5Xxs8WvifNQQAqm89doTu tgsoqkHDVeeTaHUpRxRkNmA2S5XH3hgYt0pTKLsFuShifsoOqVgpILU/gKCZWc1Mqk9p 3yKw== 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=nv63YBSn+zpYfaKlz2JLw3DQGas3Vtx+guOuZKmYDbY=; b=ILXsOlRhJJJneVj46qAZklXsqvSx3/Aj8oqgFrcXLlBxIUqsXNDnA7RI8j+A/HjLD4 gVlaspNoOBCYjvQVRg9bxYHKZlJX6vw9EIXnPOcepjkBEn133FHQ5QxICkwM1fQwFA76 4Awa4AOhevHmwIE9Mew1CURGTUocvsBbkH1IcpMOcR5fHWIkwMV87gbOxbRdkqtfc7uZ Mfv4bKBaq35vjqh3mP9lgoukVtMnazEt9XwvHiD9Ds/SAGS1XoB9cQDnCoiCCbvTcQp8 rtcyQbgIRpzCHVTd+wQeNaL3jlAgJnUXnw/mVSPDEJ/U+wI0EGJ1sT/doHfZ1knWNGPp smkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=mjqP74QW; 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 oj10-20020a17090b4d8a00b0020d887ded6esi17016228pjb.120.2022.10.24.05.19.11; Mon, 24 Oct 2022 05:19:25 -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=mjqP74QW; 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 S232839AbiJXMMF (ORCPT + 99 others); Mon, 24 Oct 2022 08:12:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232827AbiJXMLR (ORCPT ); Mon, 24 Oct 2022 08:11:17 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 053C2356CF; Mon, 24 Oct 2022 04:53:39 -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 0C3A26126B; Mon, 24 Oct 2022 11:41:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 23222C433D6; Mon, 24 Oct 2022 11:40:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666611660; bh=DGqJfFMgG4TmWzz5+DVYmlWy4iPs6CceCKlcZx+zjH0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mjqP74QWXeQ7HQQrrYjVZlGIKufqgePio8NWllMPn6f791M8k/KnodrKKNW26s5Mu 7Mzg5aWa24I4G1wN4S30p21NxDNgPymC75hAI7QoVNYOx6zFoRsGcrrKarkYeA+x6D 8Lu/wkusFwn6xSGgQhPyjNx4nyYAEEMJRhaERPcY= 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 4.9 063/159] selinux: use "grep -E" instead of "egrep" Date: Mon, 24 Oct 2022 13:30:17 +0200 Message-Id: <20221024112951.764643056@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112949.358278806@linuxfoundation.org> References: <20221024112949.358278806@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?1747571404934909841?= X-GMAIL-MSGID: =?utf-8?q?1747571404934909841?= 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 @@ -56,7 +56,7 @@ fi cd /etc/selinux/dummy/contexts/files $SF file_contexts / -mounts=`cat /proc/$$/mounts | egrep "ext2|ext3|xfs|jfs|ext4|ext4dev|gfs2" | awk '{ print $2 '}` +mounts=`cat /proc/$$/mounts | grep -E "ext2|ext3|xfs|jfs|ext4|ext4dev|gfs2" | awk '{ print $2 '}` $SF file_contexts $mounts