summaryrefslogtreecommitdiff
path: root/src/op_mode/image_installer.py
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2023-05-23 11:19:03 -0500
committerJohn Estabrook <jestabro@vyos.io>2023-12-16 20:37:10 -0600
commit0b6954306569cf8b2f126a9df1ced9975a241768 (patch)
treebf8cf400c5c6b879c9eca87a588ea97eaeca0691 /src/op_mode/image_installer.py
parent72a708e267839268652a7fabf4de1a16930dcc6e (diff)
downloadvyos-1x-0b6954306569cf8b2f126a9df1ced9975a241768.tar.gz
vyos-1x-0b6954306569cf8b2f126a9df1ced9975a241768.zip
image: T4516: do not prompt for config copy on live install
(cherry picked from commit b31092cc33685628c74845f2aa1e94f0e7879e87)
Diffstat (limited to 'src/op_mode/image_installer.py')
-rw-r--r--src/op_mode/image_installer.py6
1 files changed, 1 insertions, 5 deletions
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()