diff options
| -rw-r--r-- | data/architectures/amd64.toml | 2 | ||||
| -rw-r--r-- | data/defaults.toml | 2 | ||||
| -rwxr-xr-x | data/live-build-config/hooks/live/18-enable-disable_services.chroot | 3 | ||||
| -rwxr-xr-x | scripts/package-build/linux-kernel/build-ipt-netflow.sh | 10 |
4 files changed, 12 insertions, 5 deletions
diff --git a/data/architectures/amd64.toml b/data/architectures/amd64.toml index 292eec38..8676ad2f 100644 --- a/data/architectures/amd64.toml +++ b/data/architectures/amd64.toml @@ -8,6 +8,8 @@ packages = [ "vyos-intel-ixgbe", "vyos-intel-ixgbevf", "vyos-ipt-netflow", + "intel-microcode", + "amd64-microcode" ] [additional_repositories.salt] diff --git a/data/defaults.toml b/data/defaults.toml index 66074cae..5a4306cf 100644 --- a/data/defaults.toml +++ b/data/defaults.toml @@ -7,7 +7,7 @@ debian_distribution = "bookworm" debian_mirror = "http://deb.debian.org/debian" debian_security_mirror = "http://deb.debian.org/debian-security" -debian_archive_areas = "main contrib non-free non-free-firmware" +debian_archive_areas = "main,contrib,non-free,non-free-firmware" vyos_mirror = "https://packages.vyos.net/repositories/current" diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot index 3b4efe38..b9fbfb3f 100755 --- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot +++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot @@ -41,7 +41,6 @@ systemctl disable snmpd.service systemctl disable conserver-server.service systemctl disable dropbear.service systemctl disable fancontrol.service -systemctl disable fastnetmon.service systemctl disable ddclient.service systemctl disable ocserv.service systemctl disable tuned.service @@ -72,6 +71,8 @@ systemctl disable suricata.service systemctl disable vyconfd.service systemctl disable vpp.service systemctl disable vyos-commitd.service +systemctl disable netplug.service + echo I: Enabling services systemctl enable vyos-hostsd.service diff --git a/scripts/package-build/linux-kernel/build-ipt-netflow.sh b/scripts/package-build/linux-kernel/build-ipt-netflow.sh index 9c657676..9245a416 100755 --- a/scripts/package-build/linux-kernel/build-ipt-netflow.sh +++ b/scripts/package-build/linux-kernel/build-ipt-netflow.sh @@ -25,7 +25,7 @@ DRIVER_VERSION=$(git describe | sed s/^v//) # Build up Debian related variables required for packaging DEBIAN_ARCH=$(dpkg --print-architecture) -DEBIAN_DIR="tmp/lib/modules/${KERNEL_VERSION}${KERNEL_SUFFIX}/extra" +DEBIAN_DIR="tmp/" DEBIAN_CONTROL="${DEBIAN_DIR}/DEBIAN/control" DEBIAN_POSTINST="${CWD}/vyos-ipt-netflow.postinst" @@ -47,6 +47,8 @@ fi # build Debian package echo "I: Building Debian package vyos-ipt-netflow" cp ipt_NETFLOW.ko ${DEBIAN_DIR} +cp libipt_NETFLOW.so ${DEBIAN_DIR} +cp libip6t_NETFLOW.so ${DEBIAN_DIR} # Sign generated Kernel modules ${CWD}/sign-modules.sh ${DEBIAN_DIR} @@ -61,5 +63,7 @@ fpm --input-type dir --output-type deb --name vyos-ipt-netflow \ --maintainer "VyOS Package Maintainers <maintainers@vyos.net>" \ --description "ipt_NETFLOW module" \ --depends linux-image-${KERNEL_VERSION}${KERNEL_SUFFIX} \ - --license "GPL2" -C ${IPT_NETFLOW_SRC}/tmp --after-install ${DEBIAN_POSTINST} - + --license "GPL2" -C ${IPT_NETFLOW_SRC}/tmp --after-install ${DEBIAN_POSTINST} \ + ipt_NETFLOW.ko=/lib/modules/${KERNEL_VERSION}${KERNEL_SUFFIX}/extra/ipt_NETFLOW.ko \ + libipt_NETFLOW.so=/lib/$(uname -m)-linux-gnu/xtables/libipt_NETFLOW.so \ + libip6t_NETFLOW.so=/lib/$(uname -m)-linux-gnu/xtables/libip6t_NETFLOW.so |