From patchwork Mon Oct 24 11:29:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8761 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp430338wru; Mon, 24 Oct 2022 05:41:16 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5AlEzuo1sifenkhDM/PYtw2gz3S7GN602yLcZaUuZIuZ5FRy4VynYFFgS4GfuQTXR8TsRc X-Received: by 2002:a17:90b:2248:b0:210:10dc:a314 with SMTP id hk8-20020a17090b224800b0021010dca314mr30037989pjb.15.1666615275823; Mon, 24 Oct 2022 05:41:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666615275; cv=none; d=google.com; s=arc-20160816; b=QAAT4OwX21uCHYflx06VLFM8lVzlI3ncksobmPwa92oLRPMHWffXm2kLwiCt4o3JWe w6Z16dlxPET71jLHhz6bnHgvtNY+QoUgYwj/E/Km0n2cqPz8pSJO5FxXX+aIxIVyVerL PPdy5tM3r+rE268+CvjQtaabXRiT6m9wisvvVowWby5iLz7671FrruZk5stTnEP+T2m3 d4CE+jui5pfHWWHN6liQF694SRU1xMkY4tKh+P8PESYJIc0jJBtdC8Du7k0Cv9Hrwf5w VK190wkT3WEJXGiJHvtUXN20MGAvFY3AaAx6c5c12//8ycDeNHFb7Ffie7bgFWg3MTeX k7tA== 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=aMKFs/ZRlimc6LI4z87hs32gTDlXAqTnC1CIvaYDirBI0igK6D8Ylb40YVwydzJbNp Ue6jZdZQuR5J01Mc5Shj+gEe4Xaj1HvUsVcNCMws3ll5zf4kfHeTClc3Oy6qecWkY+o/ NovDrT8k1d6WjNdbobMWwokNGD/6nNuJwo55UlthQT4k8KmerDqW0tIJfnl6SVCkvX7m JlzCJbtlz+aNPNQHtFSW8LXaJnchFhV5ZHRgUDlps7KCryrGVjy+s1IFlmD2dTSXsSJR D4StjCSXevXDskZ5iyrlhhYR+H1sxKZBaubVprg41pTZjNNarICoKS8d82QctipoVgKs 7Wug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=sVyYn3ga; 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 i17-20020a170902c95100b0017a0c197f3fsi7256326pla.335.2022.10.24.05.41.01; Mon, 24 Oct 2022 05:41:15 -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=sVyYn3ga; 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 S233959AbiJXM3F (ORCPT + 99 others); Mon, 24 Oct 2022 08:29:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233814AbiJXM2T (ORCPT ); Mon, 24 Oct 2022 08:28:19 -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 37DD513EBA; Mon, 24 Oct 2022 05:01:54 -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 A6243B811A5; Mon, 24 Oct 2022 11:57:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 03728C433D6; Mon, 24 Oct 2022 11:57:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612656; bh=TaOMZ641qK5g+ToI/uLs8Ny1TZ131P0sMACZ7/5HZuc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sVyYn3gabMWebxyhSToh6n4xjm3vcq00/nmsI+gw2jghGDs/tcu7n/klRXis+jc7Y W3oNVMO3qhBqPlD+AfGoNnOitALfas3sS/PZSfoYz4/IZaGS4xOPj7xlM2yFSioR6x HmkWsgeNTGuMh90G/A/7tOWVnr0we55KvXxVNUEQ= 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.19 069/229] selinux: use "grep -E" instead of "egrep" Date: Mon, 24 Oct 2022 13:29:48 +0200 Message-Id: <20221024113001.309912679@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112959.085534368@linuxfoundation.org> References: <20221024112959.085534368@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?1747572779625317156?= X-GMAIL-MSGID: =?utf-8?q?1747572779625317156?= 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