summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2025-07-14 10:33:46 -0500
committerGitHub <noreply@github.com>2025-07-14 10:33:46 -0500
commit9b79553e6820c012cbed2f775323cd225f05af5c (patch)
tree3f61067292adec2034be6502dc91867a0bc20992 /src
parent59732c9b412f5d7607dc8a4790d4e9f19294f34b (diff)
parent4890a1f8a7a792b4820724981de6bd5002338c1d (diff)
downloadvyos-1x-9b79553e6820c012cbed2f775323cd225f05af5c.tar.gz
vyos-1x-9b79553e6820c012cbed2f775323cd225f05af5c.zip
Merge pull request #4606 from jestabro/fix-load-without-arg
T7627: fix regression to allow load without arg to load default config
Diffstat (limited to 'src')
-rwxr-xr-xsrc/helpers/vyos-load-config.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/helpers/vyos-load-config.py b/src/helpers/vyos-load-config.py
index 01a6a88dc..7c49e9c3a 100755
--- a/src/helpers/vyos-load-config.py
+++ b/src/helpers/vyos-load-config.py
@@ -26,17 +26,20 @@ from vyos.config import Config
from vyos.migrate import ConfigMigrate
from vyos.migrate import ConfigMigrateError
from vyos.load_config import load as load_config
+from vyos.defaults import directories
+default_config_file = os.path.join(directories['config'], 'config.boot')
+
parser = argparse.ArgumentParser()
-parser.add_argument('config_file', help='config file to load')
+parser.add_argument('config_file', nargs='?', help='config file to load')
parser.add_argument(
'--migrate', action='store_true', help='migrate config file before merge'
)
args = parser.parse_args()
-file_name = args.config_file
+file_name = args.config_file if args.config_file else default_config_file
# pylint: disable=consider-using-with
file_path = tempfile.NamedTemporaryFile(delete=False).name