mkosi: Add bpftool to final image

Useful for debugging bpf.

diff --git a/mkosi.presets/20-final/mkosi.conf.d/10-arch.conf b/mkosi.presets/20-final/mkosi.conf.d/10-arch.conf
index b0bbcf0c6ade3addb3d8b27e6071dbd1a691fd66..0b15677ff29d3bd8d9fd8063e7332b92ea3d00fd 100644 (file)
--- a/mkosi.presets/20-final/mkosi.conf.d/10-arch.conf
+++ b/mkosi.presets/20-final/mkosi.conf.d/10-arch.conf
@@ -5,6 +5,7 @@ Distribution=arch
 
 [Content]
 Packages=
+        bpf
         btrfs-progs
         compsize
         dhcp

diff --git a/mkosi.presets/20-final/mkosi.conf.d/10-centos-fedora.conf b/mkosi.presets/20-final/mkosi.conf.d/10-centos-fedora.conf
index f22aed37006779149cf3a1763cac66b6adebca46..cb68c8dd1ad9b12d126d048c2129a36d959513d0 100644 (file)
--- a/mkosi.presets/20-final/mkosi.conf.d/10-centos-fedora.conf
+++ b/mkosi.presets/20-final/mkosi.conf.d/10-centos-fedora.conf
@@ -6,6 +6,7 @@ Distribution=|fedora
 
 [Content]
 Packages=
+        bpftool
         cryptsetup
         dhcp-server
         dnf

diff --git a/mkosi.presets/20-final/mkosi.conf.d/10-debian.conf b/mkosi.presets/20-final/mkosi.conf.d/10-debian.conf
index 3eb7a5453e3a81a0fba0ae1205a6c2c8e6e67c73..d4cd53e6f2c336a36ffdaaadbc3ded7a33820f8f 100644 (file)
--- a/mkosi.presets/20-final/mkosi.conf.d/10-debian.conf
+++ b/mkosi.presets/20-final/mkosi.conf.d/10-debian.conf
@@ -5,4 +5,5 @@ Distribution=debian
 
 [Content]
 Packages=
+        bpftool
         linux-image-cloud-amd64

diff --git a/mkosi.presets/20-final/mkosi.conf.d/10-opensuse.conf b/mkosi.presets/20-final/mkosi.conf.d/10-opensuse.conf
index 54b79e06d14e8f4c4e67e38dbd1ee2d7c1118629..60a2b6dbfc5accba722e98cb9ccaf6473196c19c 100644 (file)
--- a/mkosi.presets/20-final/mkosi.conf.d/10-opensuse.conf
+++ b/mkosi.presets/20-final/mkosi.conf.d/10-opensuse.conf
@@ -5,6 +5,7 @@ Distribution=opensuse
 
 [Content]
 Packages=
+        bpftool
         btrfs-progs
         cryptsetup
         dbus-broker

diff --git a/mkosi.presets/20-final/mkosi.conf.d/10-ubuntu.conf b/mkosi.presets/20-final/mkosi.conf.d/10-ubuntu.conf
index e677797c734134e886303d0aad6da33ad26efa38..3290987824c822fec75d74e0cccd8c6e6d024633 100644 (file)
--- a/mkosi.presets/20-final/mkosi.conf.d/10-ubuntu.conf
+++ b/mkosi.presets/20-final/mkosi.conf.d/10-ubuntu.conf
@@ -8,3 +8,5 @@ Packages=
         # We would like to use linux-image-kvm but it does not have support for dm-verity
         # See https://bugs.launchpad.net/ubuntu/+source/linux-meta-kvm/+bug/2019040.
         linux-image-generic
+        linux-tools-common
+        linux-tools-generic