Skip to content

Commit bc7f46c

Browse files
committed
fix patches
Signed-off-by: Jordan Sokolic <[email protected]>
1 parent b5de6d2 commit bc7f46c

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

patches/dhcpv6.script.patch

+4-11
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,18 @@ Subject: [PATCH] Ignore non-namespaced kernel parameter modifications
22
by /lib/netifd/dhcpv6.script, they fail and generate noise in logs.
33

44
---
5-
dhcpv6.script | 4 ++++----
6-
1 file changed, 4 insertions(+), 4 deletions(-)
7-
85
diff --git a/dhcpv6.script b/dhcpv6.script
96
index 28955a3..5e51413 100755
10-
--- a/dhcpv6.script
11-
+++ b/dhcpv6.script
12-
@@ -10,10 +10,10 @@ setup_interface () {
7+
--- a/lib/netifd/dhcpv6.script
8+
+++ b/lib/netifd/dhcpv6.script
9+
@@ -10,10 +10,6 @@ setup_interface () {
1310

1411
# Apply IPv6 / ND configuration
1512
HOPLIMIT=$(cat /proc/sys/net/ipv6/conf/$device/hop_limit)
1613
- [ -n "$RA_HOPLIMIT" -a -n "$HOPLIMIT" ] && [ "$RA_HOPLIMIT" -gt "$HOPLIMIT" ] && echo "$RA_HOPLIMIT" > /proc/sys/net/ipv6/conf/$device/hop_limit
17-
- [ -n "$RA_MTU" ] && [ "$RA_MTU" -ge 1280 ] && echo "$RA_MTU" > /proc/sys/net/ipv6/conf/$device/mtu 2>/dev/null
14+
- [ -n "$RA_MTU" ] && [ "$RA_MTU" -ge 1280 ] && echo "$RA_MTU" > /proc/sys/net/ipv6/conf/$device/mtu 2>/dev/null
1815
- [ -n "$RA_REACHABLE" ] && [ "$RA_REACHABLE" -gt 0 ] && echo "$RA_REACHABLE" > /proc/sys/net/ipv6/neigh/$device/base_reachable_time_ms
1916
- [ -n "$RA_RETRANSMIT" ] && [ "$RA_RETRANSMIT" -gt 0 ] && echo "$RA_RETRANSMIT" > /proc/sys/net/ipv6/neigh/$device/retrans_time_ms
20-
+ # [ -n "$RA_HOPLIMIT" -a -n "$HOPLIMIT" ] && [ "$RA_HOPLIMIT" -gt "$HOPLIMIT" ] && echo "$RA_HOPLIMIT" > /proc/sys/net/ipv6/conf/$device/hop_limit
21-
+ # [ -n "$RA_MTU" ] && [ "$RA_MTU" -ge 1280 ] && echo "$RA_MTU" > /proc/sys/net/ipv6/conf/$device/mtu 2>/dev/null
22-
+ # [ -n "$RA_REACHABLE" ] && [ "$RA_REACHABLE" -gt 0 ] && echo "$RA_REACHABLE" > /proc/sys/net/ipv6/neigh/$device/base_reachable_time_ms
23-
+ # [ -n "$RA_RETRANSMIT" ] && [ "$RA_RETRANSMIT" -gt 0 ] && echo "$RA_RETRANSMIT" > /proc/sys/net/ipv6/neigh/$device/retrans_time_ms
2417

2518
proto_init_update "*" 1
2619

patches/gre.sh.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ they will be loaded automatically by host kernel.
44
---
55
diff --git a/gre.sh.bak b/gre.sh
66
index 3414ed3..68544bb 100755
7-
--- a/gre.sh.bak
8-
+++ b/gre.sh
7+
--- a/lib/netifd/proto/gre.sh
8+
+++ b/lib/netifd/proto/gre.sh
99
@@ -289,8 +289,8 @@ proto_grev6tap_init_config() {
1010
}
1111

0 commit comments

Comments
 (0)