From patchwork Mon Oct 24 11:29:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10051 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp622860wru; Mon, 24 Oct 2022 12:46:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6Xx1akeRSfh3YwDTNJa+2fRQvUJ6pnp2u0nSHpn6Qn50oJ1KrQeSdP1AlwtJkKIf2wRV0P X-Received: by 2002:a17:902:e88a:b0:183:9ecb:ff85 with SMTP id w10-20020a170902e88a00b001839ecbff85mr35239392plg.169.1666640805552; Mon, 24 Oct 2022 12:46:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666640805; cv=none; d=google.com; s=arc-20160816; b=0riufpfirXpKndxNnMK/a9TJaAI9VPczNnkcKRYeMO93juyAcRNWyYXoKF9mGJ00cT HQWypKbLcekTZQnZhqnoM9L9Uzhb1qldqI+XcgLXvi+oI0pQeX3/utF616VV3CC04jIg /EnPJ527CxNpB+yvlt6pxgCFb+gvVoqNblBauQUR8FNNJA4HyOqEmlmw+SBhbfbUhLs4 KfaFz5XkhLWneEzfrgatpFDn2pFZwZUW/WzUOWtKAxLuwtPLePu6sDOcHpge6LKJoYZb Qf2wa/pR0euYeUqawawH3Tz/DwxWLw/BUOKHqM33NBIuypW1NS74vkY7+s+VlC+Dmdih 3Zog== 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=SV20j36YBtmCMBO6hyVOtbbyAhX+h+AVVBda30RRb8g=; b=NgYs1emJF6rAORF8QQppROC+MtQI51N0hWpbaL3dNoSfU/TuCMZCO/XBXfP2EcUv6T r7QkZXu6hZsLdU5sjdmf+B5sx9K0L7hZX1T0eCfcn18RqpjaKIplXLvMz7QDLDlIkkzm /Za7H0DhAB840IyKEISMRF81Vf6dDlibazUkafy5cBmYVYQ9MIN3mgz17WXwXlNVORBk Qf4gv4UFx6XnpSqJdP7VLNmG+wTW0GIO6yotqXTjXsnGEYjTgXfTrsBqltH8/7YzxQna ZG93UZ/9xYpk33l7nVM/x/RnXz/t++OQySovdp0ShNi8W9aXPcoVT/NVpCkitbtNycQv 9HIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=F1JiIZfh; 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 k5-20020a63ba05000000b00434df5a8524si375421pgf.396.2022.10.24.12.46.29; Mon, 24 Oct 2022 12:46:45 -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=F1JiIZfh; 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 S233354AbiJXTkv (ORCPT + 99 others); Mon, 24 Oct 2022 15:40:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233316AbiJXTkM (ORCPT ); Mon, 24 Oct 2022 15:40:12 -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 3CB536A48B; Mon, 24 Oct 2022 11:10:11 -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 A45B3B8117D; Mon, 24 Oct 2022 11:48:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0B17EC433C1; Mon, 24 Oct 2022 11:48:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612125; bh=TaOMZ641qK5g+ToI/uLs8Ny1TZ131P0sMACZ7/5HZuc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F1JiIZfhPA2oQcXKMXgAphIqMxsJLvQXM7vGMsGGjC3JZBmDaASGO9/SXIa+iPlRy Gu7pzhWPrB1UgjW8XW0LBnVdFsbTpNPvTW23gJWj/0L9Xi7G9QEiYGJ59EeC9p1UKm 9+t+amYbNJmeLBE/lO/UvKKmIrwzkUqeakoYRkBQ= 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.14 080/210] selinux: use "grep -E" instead of "egrep" Date: Mon, 24 Oct 2022 13:29:57 +0200 Message-Id: <20221024112959.656887511@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112956.797777597@linuxfoundation.org> References: <20221024112956.797777597@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?1747599549273008208?= X-GMAIL-MSGID: =?utf-8?q?1747599549273008208?= 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 @@ -57,7 +57,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