Yureka Lilian <yureka@cyberchaos.dev> 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 = \
>  	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 = dev etc/s6-linux-init/env run proc sys var/lib/connman
> +VM_DIRS = dev etc/s6-linux-init/env proc run sys
>  
>  # 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 $(PACKAGES_FILE) $(VM_FILES)
>  	) | ../../../scripts/make-erofs.sh $@
>  
>  VM_S6_RC_FILES = \
> +<<<<<<< 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 = \
>  	image/etc/s6-rc/ok-all/type \
>  	image/etc/s6-rc/sysctl/type \
>  	image/etc/s6-rc/sysctl/up
> +=======
> +	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 <hi@alyssa.is>