Fixes DHCP and removes BPFilter

Signed-off-by: Dan Finneran <dan@thebsdbox.co.uk>
tinkerbell · Mar 19, 2021 · 6e10399 · 6e10399
1 parent b9996bc
commit 6e10399
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/hook.yaml b/hook.yaml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.39
+  image: thebsdbox/kernel:5.10.bpf
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
   - linuxkit/init:v0.8
@@ -11,6 +11,9 @@ onboot:
     image: linuxkit/sysctl:v0.8
   - name: sysfs
     image: linuxkit/sysfs:v0.8
+  - name: dhcpcd
+    image: linuxkit/dhcpcd:v0.8
+    command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
 services:
   - name: getty
     image: linuxkit/getty:v0.8

diff --git a/kernel/config-5.10.x-x86_64 b/kernel/config-5.10.x-x86_64
@@ -234,7 +234,6 @@ CONFIG_BPF_SYSCALL=y
 CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_BPF_JIT_DEFAULT_ON=y
-CONFIG_USERMODE_DRIVER=y
 # CONFIG_BPF_PRELOAD is not set
 # CONFIG_USERFAULTFD is not set
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
@@ -1400,8 +1399,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=y
 CONFIG_BRIDGE_EBT_SNAT=y
 CONFIG_BRIDGE_EBT_LOG=y
 CONFIG_BRIDGE_EBT_NFLOG=y
-CONFIG_BPFILTER=y
-CONFIG_BPFILTER_UMH=m
+# CONFIG_BPFILTER is not set
 # CONFIG_IP_DCCP is not set
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_OBJCNT is not set