diff options
| author | Daniil Baturin <daniil@vyos.io> | 2020-03-09 19:17:49 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@vyos.io> | 2020-03-09 19:17:49 +0200 |
| commit | 5dd56053319f1af72d8d684151873e559ed1de46 (patch) | |
| tree | f67c55a9ad1b729b3bfa15c57721c1f2db2b5290 /sysconf | |
| parent | f1467d4c193f02bd17b31630045cd53b7109b9e3 (diff) | |
| parent | 72516c872e1690895d0269cafcb87e4e44bf153c (diff) | |
| download | vyatta-cfg-system-5dd56053319f1af72d8d684151873e559ed1de46.tar.gz vyatta-cfg-system-5dd56053319f1af72d8d684151873e559ed1de46.zip | |
Merge branch 'crux' of github.com:vyos/vyatta-cfg-system into cruxvyos/1.2.5
Diffstat (limited to 'sysconf')
| -rw-r--r-- | sysconf/63-hyperv-vf-net.rules | 5 | ||||
| -rw-r--r-- | sysconf/64-vyos-vmware-net.rules | 14 | ||||
| -rw-r--r-- | sysconf/65-vyatta-net.rules | 7 | ||||
| -rw-r--r-- | sysconf/vyatta-sysctl.conf | 9 |
4 files changed, 35 insertions, 0 deletions
diff --git a/sysconf/63-hyperv-vf-net.rules b/sysconf/63-hyperv-vf-net.rules new file mode 100644 index 00000000..b4dcb5a3 --- /dev/null +++ b/sysconf/63-hyperv-vf-net.rules @@ -0,0 +1,5 @@ +ATTR{[dmi/id]sys_vendor}!="Microsoft Corporation", GOTO="end_hyperv_nic" + +ACTION=="add", SUBSYSTEM=="net", DRIVERS=="hv_pci", NAME="vf_%k" + +LABEL="end_hyperv_nic" diff --git a/sysconf/64-vyos-vmware-net.rules b/sysconf/64-vyos-vmware-net.rules new file mode 100644 index 00000000..66a4a069 --- /dev/null +++ b/sysconf/64-vyos-vmware-net.rules @@ -0,0 +1,14 @@ +ATTR{[dmi/id]sys_vendor}!="VMware, Inc.", GOTO="end_vmware_nic" + +ACTION=="add", SUBSYSTEM=="net", ATTRS{label}=="Ethernet0", ENV{VYOS_IFNAME}="eth0" +ACTION=="add", SUBSYSTEM=="net", ATTRS{label}=="Ethernet1", ENV{VYOS_IFNAME}="eth1" +ACTION=="add", SUBSYSTEM=="net", ATTRS{label}=="Ethernet2", ENV{VYOS_IFNAME}="eth2" +ACTION=="add", SUBSYSTEM=="net", ATTRS{label}=="Ethernet3", ENV{VYOS_IFNAME}="eth3" +ACTION=="add", SUBSYSTEM=="net", ATTRS{label}=="Ethernet4", ENV{VYOS_IFNAME}="eth4" +ACTION=="add", SUBSYSTEM=="net", ATTRS{label}=="Ethernet5", ENV{VYOS_IFNAME}="eth5" +ACTION=="add", SUBSYSTEM=="net", ATTRS{label}=="Ethernet6", ENV{VYOS_IFNAME}="eth6" +ACTION=="add", SUBSYSTEM=="net", ATTRS{label}=="Ethernet7", ENV{VYOS_IFNAME}="eth7" +ACTION=="add", SUBSYSTEM=="net", ATTRS{label}=="Ethernet8", ENV{VYOS_IFNAME}="eth8" +ACTION=="add", SUBSYSTEM=="net", ATTRS{label}=="Ethernet9", ENV{VYOS_IFNAME}="eth9" + +LABEL="end_vmware_nic" diff --git a/sysconf/65-vyatta-net.rules b/sysconf/65-vyatta-net.rules index 0f4b9006..2b48c121 100644 --- a/sysconf/65-vyatta-net.rules +++ b/sysconf/65-vyatta-net.rules @@ -13,6 +13,13 @@ KERNEL!="eth*|wlan*", GOTO="vyatta_net_end" # ignore "secondary" monitor interfaces of mac80211 drivers KERNEL=="wlan*", ATTRS{type}=="803", GOTO="vyatta_net_end" +# If using VyOS predefined names +ENV{VYOS_IFNAME}!="eth*", GOTO="end_vyos_predef_names" + +DRIVERS=="?*", PROGRAM="vyatta_net_name %k $attr{address} $env{VYOS_IFNAME}", NAME="%c", GOTO="vyatta_net_end" + +LABEL="end_vyos_predef_names" + # ignore interfaces without a driver link like bridges and VLANs DRIVERS=="?*", PROGRAM="vyatta_net_name %k $attr{address}", NAME="%c" diff --git a/sysconf/vyatta-sysctl.conf b/sysconf/vyatta-sysctl.conf index 560c29de..0314fcc5 100644 --- a/sysconf/vyatta-sysctl.conf +++ b/sysconf/vyatta-sysctl.conf @@ -80,3 +80,12 @@ net.ipv4.igmp_max_memberships = 512 # Enable conntrack helper by default net.netfilter.nf_conntrack_helper=1 + +# Increase default garbage collection thresholds +net.ipv4.neigh.default.gc_thresh1 = 1024 +net.ipv4.neigh.default.gc_thresh2 = 4096 +net.ipv4.neigh.default.gc_thresh3 = 8192 +# +net.ipv6.neigh.default.gc_thresh1 = 1024 +net.ipv6.neigh.default.gc_thresh2 = 4096 +net.ipv6.neigh.default.gc_thresh3 = 8192 |