From patchwork Mon Jun 9 13:32:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8820 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 (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4bGCXR5bZFz3wmb for ; Mon, 9 Jun 2025 13:32:39 +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 RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E5" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4bGCXQ554Lz6YB for ; Mon, 9 Jun 2025 13:32:38 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4bGCXQ4L3jz32vt for ; Mon, 9 Jun 2025 13:32:38 +0000 (UTC) X-Original-To: development@lists.ipfire.org 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 (secp384r1) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4bGCXM5134z2xHk for ; Mon, 9 Jun 2025 13:32:35 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4bGCXL6cGGz97; Mon, 9 Jun 2025 13:32:34 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1749475955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=orT5yj12ZBf80foptOwHcjBCq8UoBab8LaFBu12OREo=; b=IDVOXBaEoyZfm8P4+VdjsUYVpPgxMpc31JI44X+gaiyVxix+c8H9sgT4ljCq0bpUA2LufL UtFgf/k1nmCb3FAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1749475955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=orT5yj12ZBf80foptOwHcjBCq8UoBab8LaFBu12OREo=; b=grIkhfEILnnYq2M3aJ1QRlcjqOIjuoiD6E8LTD3+0n2tOxA9JZsLjcE9GT0czhPQ+bXaKc DKjpAVwrf7Itbdu2jfgy1rIRIgv32x1hqjB2b47Ba7h78zYnXsDQi+Le6dluaz1DeAwcsQ wS9MnuAlzIIP/bZJpV59nJaHZzs8rBJXtucpfH7VOfUwBodU5HWkaAK/qOFzksVrv5qDv7 l9v+90r8Z2Ss8bBA4DjLMvZrRWpGMBOmZt2Wp+dSWZ7uinxxDXaEvUtOz845q1WA/uomQ8 R8DCY5nD5pUhDJToHGoO8SpqG4hI5iYdrDV9hQ+cWwLpsd6RRZYkMKFk/omCWA== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [RFC PATCH 1/2] red: Update to use ip in place of deprecated vconfig Date: Mon, 9 Jun 2025 15:32:28 +0200 Message-ID: <20250609133229.3291962-1-adolf.belka@ipfire.org> Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: MIME-Version: 1.0 - I noticed that the vlan package was last updated in 2005 and that the vconfig site said that 802.1Q VLAN code is part of the official kernel, and has been for years and years. It is very unlikely that you need to download anything from this site, the packages are left here for posterity's sake. 802.1Q VLANs can be created with the 'ip' utility (vconfig works for vlans, but is crufty and deprecated). - Based on this it seemed appropriate to replace the vconfig commands with ip commands. - This patch set has been sent as an RFC PATCH as my replacement ip commands may or may not be correct and I am unable to test the effect as I do not have a pppoe connection using vlans. - I am open to any modifications or any other decision with reagard to the vlan package Signed-off-by: Adolf Belka --- src/initscripts/networking/red | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red index fddc70d92..6d779b365 100644 --- a/src/initscripts/networking/red +++ b/src/initscripts/networking/red @@ -251,7 +251,7 @@ case "${1}" in if [ "$TYPE" == "vdsl" ]; then boot_mesg "Creating VLAN Interface ${DEVICE}.${INET_VLAN} ..." modprobe 8021q - vconfig add ${DEVICE} ${INET_VLAN} + ip link add link ${DEVICE} name ${DEVICE}.${INET_VLAN} type vlan id ${INET_VLAN} if [ -n "$MAC1" ]; then boot_mesg "Setting mac address on ${DEVICE}.${INET_VLAN} to ${MAC1}" ip link set dev ${DEVICE}.${INET_VLAN} address ${MAC1} @@ -276,7 +276,7 @@ case "${1}" in if [ ! -f "$PIDFILE" ]; then boot_mesg "Creating VLAN Interface ${DEVICE}.${IPTV_VLAN} ..." modprobe 8021q - vconfig add ${DEVICE} ${IPTV_VLAN} + ip link add link ${DEVICE} name ${DEVICE}.${IPTV_VLAN} type vlan id ${IPTV_VLAN} if [ -n "$MAC2" ]; then boot_mesg "Setting mac address on ${DEVICE}.${IPTV_VLAN} to ${MAC2}" ip link set dev ${DEVICE}.${IPTV_VLAN} address ${MAC2} @@ -548,7 +548,7 @@ case "${1}" in if echo "${link_status}" | grep -q UP; then boot_mesg "Bringing down the ${DEVICE}.${INET_VLAN} interface..." ip link set ${DEVICE}.${INET_VLAN} down - vconfig rem ${DEVICE}.${INET_VLAN} + ip link delete ${DEVICE}.${INET_VLAN} evaluate_retval fi else From patchwork Mon Jun 9 13:32:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8821 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 (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4bGCXS1GZdz3x60 for ; Mon, 9 Jun 2025 13:32:40 +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 RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E5" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4bGCXR2wnbz6dr for ; Mon, 9 Jun 2025 13:32:39 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4bGCXR2Bsgz335l for ; Mon, 9 Jun 2025 13:32:39 +0000 (UTC) X-Original-To: development@lists.ipfire.org 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 (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4bGCXN2WKZz339D for ; Mon, 9 Jun 2025 13:32:36 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4bGCXM48jpz34v; Mon, 9 Jun 2025 13:32:35 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1749475955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xb8Z55855UNjrg34Vc9M8HFIXbmc4MiVMiTE5VRF0PQ=; b=FAsyEhplnFwuEqMUvGWQR4A2ZQER8Dcerx3qMyqpVnSNecC7nTp5KS0ruV3wCDQAuc8wNu cnbEI+pOjBBv0YBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1749475955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xb8Z55855UNjrg34Vc9M8HFIXbmc4MiVMiTE5VRF0PQ=; b=Y3JmPo8z9HExok4H7JIWFW+8rxP8+16Z8v8etlR5SmHinKkcMNS3UPcrE8rAFVIMB8n1U8 yDs82wK/4i8WSlScSWS/sIvybqDUMxI/ECwXKKjQ09fv4+66ZOQUFxDqUoqf4yCRonZeRa 87n/2HC2RbDpgxr+YtOwzM8ds6Roflyp+WrLk96dJbHmIcgXygeUo87NPLA2lpttU8khb9 HtOkECYGdXYRyqtGoIu2bUyDlToy1tbXcweIRrw0xAcL4d1hZSO1AHcSI095Ytp1vOLyMj z+EURFzLOq4iyXeY4g4mBDrXY8ITIMn1kTZHecDmZnUX9zGMPTU5DIW8v30aNQ== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [RFC PATCH 2/2] vlan: Removal of package after replacement of vconfig commands with ip commands Date: Mon, 9 Jun 2025 15:32:29 +0200 Message-ID: <20250609133229.3291962-2-adolf.belka@ipfire.org> In-Reply-To: <20250609133229.3291962-1-adolf.belka@ipfire.org> References: <20250609133229.3291962-1-adolf.belka@ipfire.org> Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: MIME-Version: 1.0 Signed-off-by: Adolf Belka --- config/rootfiles/common/vlan | 1 - lfs/vlan | 76 ------------------------------------ make.sh | 1 - 3 files changed, 78 deletions(-) delete mode 100644 config/rootfiles/common/vlan delete mode 100644 lfs/vlan diff --git a/config/rootfiles/common/vlan b/config/rootfiles/common/vlan deleted file mode 100644 index 9d7eb4cf0..000000000 --- a/config/rootfiles/common/vlan +++ /dev/null @@ -1 +0,0 @@ -sbin/vconfig diff --git a/lfs/vlan b/lfs/vlan deleted file mode 100644 index a472df5ee..000000000 --- a/lfs/vlan +++ /dev/null @@ -1,76 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 1.9 - -THISAPP = vlan.$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/vlan -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_BLAKE2 = 195acf3d3bf12de3d11856ec3fdab9791d744af8a5c0003d42a2dd8dda5b22d92bdb43aac392a2c3281cf43f67c2b05dc442352f1cfb589bc540593a92a2a46d - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -b2 : $(subst %,%_BLAKE2,$(objects)) - -############################################################################### -# Downloading, checking, b2sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_BLAKE2,$(objects)) : - @$(B2SUM) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make purge vconfig - cd $(DIR_APP) && install -c -p -m 0755 vconfig /sbin - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 25489a2f1..f558de5e1 100755 --- a/make.sh +++ b/make.sh @@ -1791,7 +1791,6 @@ build_system() { lfsmake2 calamaris lfsmake2 tcpdump lfsmake2 traceroute - lfsmake2 vlan lfsmake2 wireless lfsmake2 pakfire lfsmake2 lz4