From 0b6954306569cf8b2f126a9df1ced9975a241768 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Tue, 23 May 2023 11:19:03 -0500 Subject: image: T4516: do not prompt for config copy on live install (cherry picked from commit b31092cc33685628c74845f2aa1e94f0e7879e87) --- src/op_mode/image_installer.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/op_mode') diff --git a/src/op_mode/image_installer.py b/src/op_mode/image_installer.py index 1f3245316..32ec075e4 100644 --- a/src/op_mode/image_installer.py +++ b/src/op_mode/image_installer.py @@ -415,11 +415,7 @@ def install_image() -> None: chown(target_config_dir, group='vyattacfg') chmod_2775(target_config_dir) # copy config - if migrate_config(): - copy('/opt/vyatta/etc/config/config.boot', target_config_dir) - else: - copy('/opt/vyatta/etc/config.boot.default', - f'{target_config_dir}/config.boot') + copy('/opt/vyatta/etc/config/config.boot', target_config_dir) configure_authentication(f'{target_config_dir}/config.boot', user_password) Path(f'{target_config_dir}/.vyatta_config').touch() -- cgit v1.2.3