patch wg-quick to suppress false sysctl warning

dappnode · Jan 29, 2023 · 79e0e99 · 79e0e99
1 parent 40aaa18
commit 79e0e99
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -18,7 +18,7 @@ RUN \
     curl \
     dkms \
     git \
-    gnupg \ 
+    gnupg \
     ifupdown \
     iproute2 \
     iptables \
@@ -43,6 +43,7 @@ RUN \
   git clone https://git.zx2c4.com/wireguard-tools && \
   cd wireguard-tools && \
   git checkout "${WIREGUARD_RELEASE}" && \
+  sed -i 's|\[\[ $proto == -4 \]\] && cmd sysctl -q net\.ipv4\.conf\.all\.src_valid_mark=1|[[ $proto == -4 ]] \&\& [[ $(sysctl -n net.ipv4.conf.all.src_valid_mark) != 1 ]] \&\& cmd sysctl -q net.ipv4.conf.all.src_valid_mark=1|' src/wg-quick/linux.bash && \
   make -C src -j$(nproc) && \
   make -C src install && \
   echo "**** install CoreDNS ****" && \

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -18,7 +18,7 @@ RUN \
     curl \
     dkms \
     git \
-    gnupg \ 
+    gnupg \
     ifupdown \
     iproute2 \
     iptables \
@@ -43,6 +43,7 @@ RUN \
   git clone https://git.zx2c4.com/wireguard-tools && \
   cd wireguard-tools && \
   git checkout "${WIREGUARD_RELEASE}" && \
+  sed -i 's|\[\[ $proto == -4 \]\] && cmd sysctl -q net\.ipv4\.conf\.all\.src_valid_mark=1|[[ $proto == -4 ]] \&\& [[ $(sysctl -n net.ipv4.conf.all.src_valid_mark) != 1 ]] \&\& cmd sysctl -q net.ipv4.conf.all.src_valid_mark=1|' src/wg-quick/linux.bash && \
   make -C src -j$(nproc) && \
   make -C src install && \
   echo "**** install CoreDNS ****" && \

diff --git a/Dockerfile.armhf b/Dockerfile.armhf
@@ -18,7 +18,7 @@ RUN \
     curl \
     dkms \
     git \
-    gnupg \ 
+    gnupg \
     ifupdown \
     iproute2 \
     iptables \
@@ -43,6 +43,7 @@ RUN \
   git clone https://git.zx2c4.com/wireguard-tools && \
   cd wireguard-tools && \
   git checkout "${WIREGUARD_RELEASE}" && \
+  sed -i 's|\[\[ $proto == -4 \]\] && cmd sysctl -q net\.ipv4\.conf\.all\.src_valid_mark=1|[[ $proto == -4 ]] \&\& [[ $(sysctl -n net.ipv4.conf.all.src_valid_mark) != 1 ]] \&\& cmd sysctl -q net.ipv4.conf.all.src_valid_mark=1|' src/wg-quick/linux.bash && \
   make -C src -j$(nproc) && \
   make -C src install && \
   echo "**** install CoreDNS ****" && \

diff --git a/README.md b/README.md
@@ -332,6 +332,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **28.01.23:** - Patch wg-quick to suppress false positive sysctl warning.
 * **10.01.23:** - Add new var to add `PersistentKeepalive` to server config for select peers to survive server IP changes when domain name is used.
 * **26.10.22:** - Better handle unsupported peer names. Improve logging.
 * **12.10.22:** - Add Alpine branch. Optimize wg and coredns services.

diff --git a/readme-vars.yml b/readme-vars.yml
@@ -127,6 +127,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "28.01.23:", desc: "Patch wg-quick to suppress false positive sysctl warning." }
   - { date: "10.01.23:", desc: "Add new var to add `PersistentKeepalive` to server config for select peers to survive server IP changes when domain name is used." }
   - { date: "26.10.22:", desc: "Better handle unsupported peer names. Improve logging." }
   - { date: "12.10.22:", desc: "Add Alpine branch. Optimize wg and coredns services." }