summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2022-03-30 09:35:12 -0400
committerDaniil Baturin <daniil@vyos.io>2022-03-30 09:35:12 -0400
commit059095962f0a076a53f43ef24222e4afd9c9be81 (patch)
tree519a6d51418f546cbfdf45fd1d8c0bea388f0c9a /python
parent43a3300afed5d4b4bee203d2abc741954a865ba3 (diff)
downloadvyos-1x-059095962f0a076a53f43ef24222e4afd9c9be81.tar.gz
vyos-1x-059095962f0a076a53f43ef24222e4afd9c9be81.zip
T4319: do not try to add ::1/128 to lo when IPv6 is disabled
Diffstat (limited to 'python')
-rw-r--r--python/vyos/ifconfig/loopback.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/python/vyos/ifconfig/loopback.py b/python/vyos/ifconfig/loopback.py
index 768d1eaf0..de554ef44 100644
--- a/python/vyos/ifconfig/loopback.py
+++ b/python/vyos/ifconfig/loopback.py
@@ -1,4 +1,4 @@
-# Copyright 2019 VyOS maintainers and contributors <maintainers@vyos.io>
+# Copyright 2019-2022 VyOS maintainers and contributors <maintainers@vyos.io>
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -13,6 +13,8 @@
# You should have received a copy of the GNU Lesser General Public
# License along with this library. If not, see <http://www.gnu.org/licenses/>.
+import vyos.util
+
from vyos.ifconfig.interface import Interface
@Interface.register
@@ -61,7 +63,10 @@ class LoopbackIf(Interface):
addr = config.get('address', [])
# We must ensure that the loopback addresses are never deleted from the system
- addr += self._persistent_addresses
+ addr += ['127.0.0.1/8']
+
+ if (vyos.util.sysctl_read('net.ipv6.conf.all.disable_ipv6') == '0'):
+ addr += ['::1/128']
# Update IP address entry in our dictionary
config.update({'address' : addr})