From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 8D912CC5A; Tue, 23 Sep 2025 15:24:38 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id EFFC1CC44; Tue, 23 Sep 2025 15:24:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_MISSING,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 Received: from fout-a2-smtp.messagingengine.com (fout-a2-smtp.messagingengine.com [103.168.172.145]) by atuin.qyliss.net (Postfix) with ESMTPS id A030FCC41 for ; Tue, 23 Sep 2025 15:24:32 +0000 (UTC) Received: from phl-compute-10.internal (phl-compute-10.internal [10.202.2.50]) by mailfout.phl.internal (Postfix) with ESMTP id DE76FEC0106; Tue, 23 Sep 2025 11:24:31 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-10.internal (MEProxy); Tue, 23 Sep 2025 11:24:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1758641071; x=1758727471; bh=mDxX4RaF7z NTm1O12cMetEEiJgiMgr6cZv2YnT9Js2A=; b=Vdy1Eoj4DQBuErJlB9Aen7v7X1 CNqO0HIvEgwsc3JRNtiIkXnGXGVHhjc4Ydf3buammgMml3olPfErpn6oK/RJ+Azc Qf91P0a1MZontQLfHDrNc1RjPYJidF6Yx/HSDSA4VbOAmVJcZdMpwZGw9hjsS7Sa qoHwIh+Nwl4Qy+FC4rVy34XZQKa+IlvkpYFzjNgwr5vtNKmyWUYnYBvrtmQ07INY YRvhmJBHTiHWDs6NbGqNAPcViTvIhPLiVkDjJMJzRIdJ4fcTvDauq7HhEY6Xe4yh zxSb4o606jqafTWIUuUIOzZombSJ3qvEDp+EMC+BRu5vlQZsgOviCNNgbDBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1758641071; x=1758727471; bh=mDxX4RaF7zNTm1O12cMetEEiJgiMgr6cZv2 YnT9Js2A=; b=B2zhejkgYQSEiG0e4QBxv6hMZyxyLhV6lj9s3RTr0ZEIVL2D40M NLO7K7hviY7sAbO/wHTEat1M7iXLBJodngRqxvM2cWmeGtOWzEEOT6MQu7pVM9pU RfUCldrnZtvo4j2ECWv0L4BKIGPjDJc0l9Nzd/IiyKmmbvnvNdqyE5D3oc7B86k6 5TfxrDA+mg996DA2ifRzr79Ye70r7KqVtEw2pxf/zdZckBOQSd0huM42YjRbKWiB YSvPOQp+P+Eo0IMJ6ueivVOVCw9T+d0yH3+GHd8MjC8Pzz4M3tcmT9yy54IEgsto EuN+7IPXE00AiXG5Q0UlIlkSAoIkvWN3/+w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdeggdeiuddtkecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjug hrpefhvfevufgjfhffkfggtgesghdtreertddttdenucfhrhhomheptehlhihsshgrucft ohhsshcuoehhihesrghlhihsshgrrdhisheqnecuggftrfgrthhtvghrnhepieduffeuie elgfetgfdttddtkeekheekgfehkedufeevteegfeeiffetvdetueevnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhephhhisegrlhihshhsrgdrih hspdhnsggprhgtphhtthhopedvpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeih uhhrvghkrgestgihsggvrhgthhgrohhsrdguvghvpdhrtghpthhtohepuggvvhgvlhessh hpvggtthhruhhmqdhoshdrohhrgh X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 23 Sep 2025 11:24:31 -0400 (EDT) Received: by mbp.qyliss.net (Postfix, from userid 1000) id 02FB824C7A7F; Tue, 23 Sep 2025 17:24:14 +0200 (CEST) From: Alyssa Ross To: Yureka Lilian Subject: Re: [PATCH RFC v4 5/5] vm/sys/net: integrate xdp-forwarder In-Reply-To: <20250923132012.28013-6-yureka@cyberchaos.dev> References: <20250923132012.28013-1-yureka@cyberchaos.dev> <20250923132012.28013-6-yureka@cyberchaos.dev> Date: Tue, 23 Sep 2025 17:24:14 +0200 Message-ID: <87tt0tkx9d.fsf@alyssa.is> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Message-ID-Hash: HVXY4QBB64LFTGVX6MJ2TKIJSWKWQFIG X-Message-ID-Hash: HVXY4QBB64LFTGVX6MJ2TKIJSWKWQFIG X-MailFrom: hi@alyssa.is X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: devel@spectrum-os.org X-Mailman-Version: 3.3.9 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Yureka Lilian writes: > --- > vm/sys/net/Makefile | 19 +++++++++++-- > vm/sys/net/default.nix | 21 ++++++++------- > vm/sys/net/image/etc/fstab | 2 ++ > vm/sys/net/image/etc/mdev/iface | 27 ++++++------------- > vm/sys/net/image/etc/nftables.conf | 8 ------ > vm/sys/net/image/etc/s6-rc/connman/type | 1 - > .../net/image/etc/s6-rc/connman/type.license | 2 -- > .../net/image/etc/s6-rc/mdevd-coldplug/type | 1 - > .../net/image/etc/s6-rc/nftables/type.license | 2 -- > vm/sys/net/image/etc/s6-rc/nftables/up | 6 ----- > 10 files changed, 39 insertions(+), 50 deletions(-) > delete mode 100644 vm/sys/net/image/etc/nftables.conf > delete mode 100644 vm/sys/net/image/etc/s6-rc/connman/type > delete mode 100644 vm/sys/net/image/etc/s6-rc/connman/type.license > delete mode 100644 vm/sys/net/image/etc/s6-rc/mdevd-coldplug/type > delete mode 100644 vm/sys/net/image/etc/s6-rc/nftables/type.license > delete mode 100644 vm/sys/net/image/etc/s6-rc/nftables/up > > diff --git a/vm/sys/net/Makefile b/vm/sys/net/Makefile > index 0193cc8..28e924b 100644 > --- a/vm/sys/net/Makefile > +++ b/vm/sys/net/Makefile > @@ -34,12 +34,11 @@ VM_FILES =3D \ > image/etc/init \ > image/etc/mdev.conf \ > image/etc/mdev/iface \ > - image/etc/nftables.conf \ > image/etc/passwd \ > image/etc/s6-linux-init/run-image/service/getty-hvc0/run \ > image/etc/s6-linux-init/scripts/rc.init \ > image/etc/sysctl.conf > -VM_DIRS =3D dev etc/s6-linux-init/env run proc sys var/lib/connman > +VM_DIRS =3D dev etc/s6-linux-init/env proc run sys >=20=20 > # These are separate because they need to be included, but putting > # them as make dependencies would confuse make. > @@ -59,6 +58,7 @@ build/rootfs.erofs: ../../../scripts/make-erofs.sh $(PA= CKAGES_FILE) $(VM_FILES) > ) | ../../../scripts/make-erofs.sh $@ >=20=20 > VM_S6_RC_FILES =3D \ > +<<<<<<< HEAD > image/etc/s6-rc/connman/dependencies.d/dbus \ > image/etc/s6-rc/connman/run \ > image/etc/s6-rc/connman/type \ > @@ -77,6 +77,21 @@ VM_S6_RC_FILES =3D \ > image/etc/s6-rc/ok-all/type \ > image/etc/s6-rc/sysctl/type \ > image/etc/s6-rc/sysctl/up > +=3D=3D=3D=3D=3D=3D=3D > + etc/s6-rc/dbus/notification-fd \ > + etc/s6-rc/dbus/run \ > + etc/s6-rc/dbus/type \ > + etc/s6-rc/mdevd-coldplug/dependencies \ > + etc/s6-rc/mdevd-coldplug/type \ > + etc/s6-rc/mdevd-coldplug/up \ > + etc/s6-rc/mdevd/notification-fd \ > + etc/s6-rc/mdevd/run \ > + etc/s6-rc/mdevd/type \ > + etc/s6-rc/ok-all/contents \ > + etc/s6-rc/ok-all/type \ > + etc/s6-rc/sysctl/type \ > + etc/s6-rc/sysctl/up > +>>>>>>> 45850c5 (vm/sys/net: integrate xdp-forwarder) Merge conflict! With that fixed: Reviewed-by: Alyssa Ross --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRV/neXydHjZma5XLJbRZGEIw/wogUCaNK7ngAKCRBbRZGEIw/w olp9AQCQp1JaaEk1uFChmYKRSW7ZsXB4+TfuBCQctVvKeTQnvgD/flRZJVgss8za coNAsKcL6zXPZDlAyRWaNygqeBLo5Ak= =312p -----END PGP SIGNATURE----- --=-=-=--