From 5af4212dbf0c7e2ad0e9761c353c4257133c2446 Mon Sep 17 00:00:00 2001 From: Rainson12 Date: Fri, 28 Oct 2022 11:32:17 +0200 Subject: [PATCH 1/2] update documentation to fix issue 2983 this fixes https://github.com/kubernetes-sigs/kind/issues/2983 --- site/content/docs/user/using-wsl2.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/site/content/docs/user/using-wsl2.md b/site/content/docs/user/using-wsl2.md index d732dfefe6..dc480815c4 100644 --- a/site/content/docs/user/using-wsl2.md +++ b/site/content/docs/user/using-wsl2.md @@ -102,11 +102,12 @@ WSL2 kernel is missing `xt_recent` kernel module, which is used by Kube Proxy to {{< codeFromInline lang="bash" >}} docker run --name wsl-kernel-builder --rm -it ubuntu:latest bash -WSL_COMMIT_REF=linux-msft-5.4.72 # change this line to the version you want to build +WSL_COMMIT_REF=linux-msft-wsl-5.10.102.1 # change this line to the version you want to build # Install dependencies apt update -apt install -y git build-essential flex bison libssl-dev libelf-dev bc +apt install -y build-essential flex bison bc dwarves libssl-dev git libelf-dev python3 + # Checkout WSL2 Kernel repo mkdir src @@ -114,13 +115,13 @@ cd src git init git remote add origin https://github.com/microsoft/WSL2-Linux-Kernel.git git config --local gc.auto 0 -git -c protocol.version=2 fetch --no-tags --prune --progress --no-recurse-submodules --depth=1 origin +${WSL_COMMIT_REF}:refs/remotes/origin/build/linux-msft-wsl-5.4.y -git checkout --progress --force -B build/linux-msft-wsl-5.4.y refs/remotes/origin/build/linux-msft-wsl-5.4.y +git -c protocol.version=2 fetch --no-tags --prune --progress --no-recurse-submodules --depth=1 origin +${WSL_COMMIT_REF}:refs/remotes/origin/build/linux-msft-wsl-5.10.y +git checkout --progress --force -B build/linux-msft-wsl-5.10.y refs/remotes/origin/build/linux-msft-wsl-5.10.y # Enable xt_recent kernel module sed -i 's/# CONFIG_NETFILTER_XT_MATCH_RECENT is not set/CONFIG_NETFILTER_XT_MATCH_RECENT=y/' Microsoft/config-wsl -# Compile the kernel +# Compile the kernel (press no when prompted) make -j2 KCONFIG_CONFIG=Microsoft/config-wsl # From the host terminal copy the newly built kernel From b008e257913eb23ab9a6cafec023e77eebc70a80 Mon Sep 17 00:00:00 2001 From: Rainson12 Date: Fri, 28 Oct 2022 11:33:34 +0200 Subject: [PATCH 2/2] Update using-wsl2.md --- site/content/docs/user/using-wsl2.md | 1 - 1 file changed, 1 deletion(-) diff --git a/site/content/docs/user/using-wsl2.md b/site/content/docs/user/using-wsl2.md index dc480815c4..2f0b4faea5 100644 --- a/site/content/docs/user/using-wsl2.md +++ b/site/content/docs/user/using-wsl2.md @@ -108,7 +108,6 @@ WSL_COMMIT_REF=linux-msft-wsl-5.10.102.1 # change this line to the version you w apt update apt install -y build-essential flex bison bc dwarves libssl-dev git libelf-dev python3 - # Checkout WSL2 Kernel repo mkdir src cd src