From patchwork Thu Mar 25 20:49:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo-Andres Hofmann X-Patchwork-Id: 3984 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4F5y0Q0wBfz3xCc for ; Thu, 25 Mar 2021 20:49:58 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4F5y0P0yGnz1Gb; Thu, 25 Mar 2021 20:49:57 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4F5y0N6Mlbz2y5R; Thu, 25 Mar 2021 20:49:56 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4F5y0L5MZGz2xb4 for ; Thu, 25 Mar 2021 20:49:54 +0000 (UTC) Received: from arche.uberspace.de (arche.uberspace.de [185.26.156.147]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 4F5y0K6qmyzm3 for ; Thu, 25 Mar 2021 20:49:53 +0000 (UTC) Received: (qmail 5395 invoked from network); 25 Mar 2021 20:49:50 -0000 Received: from localhost (HELO localhost) (127.0.0.1) by arche.uberspace.de with SMTP; 25 Mar 2021 20:49:50 -0000 From: Leo-Andres Hofmann To: development@lists.ipfire.org Subject: [PATCH] header.pl: Hide PPPoE menu item if RED is in IP mode Date: Thu, 25 Mar 2021 21:49:41 +0100 Message-Id: <20210325204942.1780-1-hofmann@leo-andres.de> X-Mailer: git-send-email 2.27.0.windows.1 MIME-Version: 1.0 ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=none; spf=pass (mail01.ipfire.org: domain of hofmann@leo-andres.de designates 185.26.156.147 as permitted sender) smtp.mailfrom=hofmann@leo-andres.de ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1616705394; a=rsa-sha256; cv=none; b=uru8p3T2e5GzYXhy4lNWnHmMPNCzK/KK1op0cS5AL9gTrzRFpM2Ts94GWT3j0Hu2gmnmSC Uq63goAUrdDqU/TI0xeooVhO2jZHDEu+Xa+WUZZqx3xEYJhz2rLFO9vCzMGYch+Ud5x8tN R3s86kMBnDL99kMESGtIrRPNXLpNRtv7ISZyUzwk4JogoAe2WL8kk+jQnNC3T9BFz7JPfj XwJNuAIOlmBzUE0Xf0SVCvWpqFs1PkQr6Pmp4CN3jbokjiV3xUigs5TMftWeZP7DM+M4ve t7U8OVpt8zyuOlfmV5NFrdd82yntrZOG7Fk4QJg2JwIQfph0ls7fsA+vqEtqeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1616705394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=q+Ajd8cQlQjSRk/9W1f4mFm8iCLOGFH5mHLM3Wx3pso=; b=GXrNrCDT47MLl3H4fWMsfIu8bUgW4FjpuxP1gz7QAKKEoGeoAKtmmCjDfP5Qn/84CrYY7+ K3bK8b29xyp7XrscFhA5pe48Eqv9KVvPSI4zSAdUtfdnvbk/F5odDONKHU8vOR2ta19Gi2 X7v7TO5ZdaFNM9NKzpmBjZYRt5IP8FfWFOyvTFzpT4n+4gc8HEWRtYAmXUSIiQFx5F66DZ sAqpjud90LO5A8wmOJbCZugojwDpJgCV/Tscem1Wcv0lDCvxU7zZf0j8Ll2wEjP+kICCrm t94SyiuajeSU0aKQgvZfCbtHF4BroPdLDmSvYgKZIBVgwo9mc+HCkwX8IatoTg== X-Rspamd-Queue-Id: 4F5y0K6qmyzm3 X-Rspamd-Server: mail01.haj.ipfire.org Authentication-Results: mail01.ipfire.org; dkim=none; dmarc=none; spf=pass (mail01.ipfire.org: domain of hofmann@leo-andres.de designates 185.26.156.147 as permitted sender) smtp.mailfrom=hofmann@leo-andres.de X-Spamd-Result: default: False [-0.24 / 11.00]; R_MISSING_CHARSET(2.50)[]; IP_REPUTATION_HAM(-1.94)[asn: 205766(-0.28), country: DE(-0.01), ip: 185.26.156.147(-0.69)]; TO_DN_NONE(0.00)[]; BROKEN_CONTENT_TYPE(1.50)[]; R_SPF_ALLOW(-0.20)[+mx]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:205766, ipnet:185.26.156.0/24, country:DE]; RCVD_TLS_LAST(0.00)[]; BAYES_HAM(-3.00)[99.99%]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[leo-andres.de]; RCPT_COUNT_ONE(0.00)[1]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Fixes: #11342 Signed-off-by: Leo-Andres Hofmann Reviewed-by: Peter Müller --- config/cfgroot/header.pl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index 5684c01c5..8dea804d0 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -170,6 +170,12 @@ sub genmenu { $menu->{'02.status'}{'subMenu'}->{'74.modem-status'}{'enabled'} = 1; } + # Disable the Dialup/PPPoE menu item when the RED interface is in IP mode + # (the "Network" module is loaded by general-functions.pl) + if(&Network::is_red_mode_ip()) { + $menu->{'01.system'}{'subMenu'}->{'20.dialup'}{'enabled'} = 0; + } + # Disbale unusable things in cloud environments if (&General::running_in_cloud()) { $menu->{'03.network'}{'subMenu'}->{'30.dhcp'}{'enabled'} = 0;