Skip to content

Commit

Permalink
nomodules turn off
Browse files Browse the repository at this point in the history
  • Loading branch information
jakubno committed Feb 7, 2024
1 parent 8a319f3 commit c6473f5
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion packages/env-build-task-driver/dev-scripts/start-vm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FC_IP="169.254.0.21"
TAP_IP="169.254.0.22"
FC_MAC="02:FC:00:00:00:05"

KERNEL_BOOT_ARGS="console=ttyS0 ip=${FC_IP}::${TAP_IP}:${MASK_LONG}::eth0:off reboot=k panic=1 pci=off nomodules i8042.nokbd i8042.noaux ipv6.disable=1 random.trust_cpu=on"
KERNEL_BOOT_ARGS="console=ttyS0 ip=${FC_IP}::${TAP_IP}:${MASK_LONG}::eth0:off reboot=k panic=1 pci=off i8042.nokbd i8042.noaux ipv6.disable=1 random.trust_cpu=on"

ip link del "$TAP_DEV" 2> /dev/null || true
ip tuntap add dev "$TAP_DEV" mode tap
Expand Down
5 changes: 3 additions & 2 deletions packages/env-build-task-driver/internal/env/snapshot.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"sync"
"time"

firecracker "github.com/firecracker-microvm/firecracker-go-sdk"
"github.com/firecracker-microvm/firecracker-go-sdk"
"github.com/go-openapi/strfmt"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/trace"
Expand Down Expand Up @@ -276,7 +276,8 @@ func (s *Snapshot) configureFC(ctx context.Context, tracer trace.Tracer) error {
defer childSpan.End()

ip := fmt.Sprintf("%s::%s:%s:instance:eth0:off:8.8.8.8", fcAddr, fcTapAddress, fcMaskLong)
kernelArgs := fmt.Sprintf("quiet loglevel=1 ip=%s reboot=k panic=1 pci=off nomodules i8042.nokbd i8042.noaux ipv6.disable=1 random.trust_cpu=on", ip)
// TODO: nomodules alternative - we need fuse
kernelArgs := fmt.Sprintf("quiet loglevel=1 ip=%s reboot=k panic=1 pci=off i8042.nokbd i8042.noaux ipv6.disable=1 random.trust_cpu=on", ip)
kernelImagePath := s.env.KernelMountedPath()
bootSourceConfig := operations.PutGuestBootSourceParams{
Context: childCtx,
Expand Down
4 changes: 4 additions & 0 deletions packages/fc-kernels/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ function build_version {
echo "Building kernel version: $kernel_version"
make vmlinux -j "$(nproc)"

# TODO: not sure about this
echo "Installing kernel modules"
make modules_install -j "$(nproc)"

echo "Copying finished build to builds directory"
mkdir -p "../builds/vmlinux-${kernel_version}"
cp vmlinux "../builds/vmlinux-${kernel_version}/vmlinux.bin"
Expand Down

0 comments on commit c6473f5

Please sign in to comment.