From 90c7a2b8cdfd61dc48c910f9aa48354ba104c183 Mon Sep 17 00:00:00 2001 From: sarthurdev <965089+sarthurdev@users.noreply.github.com> Date: Wed, 11 Mar 2026 10:07:21 +0100 Subject: geoip: T6768: Add system name-server check --- src/helpers/geoip-update.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/helpers/geoip-update.py b/src/helpers/geoip-update.py index 8a414267e..18ad0ecb8 100755 --- a/src/helpers/geoip-update.py +++ b/src/helpers/geoip-update.py @@ -13,6 +13,8 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +# +# Note: script is used both in opmode and by build hook `40-init-geoip-database.chroot` import argparse import sys @@ -26,12 +28,7 @@ from vyos.geoip import db_import_dbip_ranges from vyos.geoip import db_import_maxmind_ranges from vyos.geoip import geoip_update -def get_config(config=None): - if config: - conf = config - else: - conf = ConfigTreeQuery() - +def get_config(conf): return ( conf.get_config_dict(['firewall', 'global-options', 'geoip'], key_mangling=('-', '_'), get_first_key=True, no_tag_node_value_mangle=True, with_defaults=True), @@ -51,7 +48,13 @@ if __name__ == '__main__': db_import_dbip_ranges(delete_file=True) sys.exit(0) - options, firewall, policy = get_config() + conf = ConfigTreeQuery() + + if not conf.exists(['system', 'name-server']): + print('There are no system name-servers configured') + sys.exit(1) + + options, firewall, policy = get_config(conf) if not db_is_initialised(): db_initialise() -- cgit v1.2.3