diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-10-06 21:24:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-06 21:24:09 +0200 |
| commit | 238a6bc81bae444a6d8fa1c223d9d5a4e4aa66f7 (patch) | |
| tree | e84a9636212fa73beb5926ea04a70c6c08037906 /src | |
| parent | d21b01246a6ef01e407f62cb908e625462fbdc40 (diff) | |
| parent | 3b5034b87303e90ec086632896cdab9d5c969ae0 (diff) | |
| download | vyos-1x-238a6bc81bae444a6d8fa1c223d9d5a4e4aa66f7.tar.gz vyos-1x-238a6bc81bae444a6d8fa1c223d9d5a4e4aa66f7.zip | |
Merge pull request #4777 from jestabro/fix-regression-image-installer
T7818: remove uneeded calls of get_cli_kernel_options causing regression
Diffstat (limited to 'src')
| -rwxr-xr-x | src/op_mode/image_installer.py | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/op_mode/image_installer.py b/src/op_mode/image_installer.py index a5afd26f4..457721391 100755 --- a/src/op_mode/image_installer.py +++ b/src/op_mode/image_installer.py @@ -1113,9 +1113,6 @@ def add_image(image_path: str, vrf: str = None, username: str = '', # Now remove from current image Path('/opt/vyatta/etc/config/first_boot').unlink() - - cmdline_options = get_cli_kernel_options( - f'/opt/vyatta/etc/config/config.boot') else: print('Copying configuration directory') # copytree preserves perms but not ownership: @@ -1129,18 +1126,12 @@ def add_image(image_path: str, vrf: str = None, username: str = '', # This can be used for a future automatic rollback into the old image. tmp = {'previous_image' : image.get_running_image()} write_file(f'{target_config_dir}/first_boot', dumps(tmp)) - - cmdline_options = get_cli_kernel_options( - f'{target_config_dir}/config.boot') else: Path(target_config_dir).mkdir(parents=True) chown(target_config_dir, group='vyattacfg') chmod_2775(target_config_dir) Path(f'{target_config_dir}/.vyatta_config').touch() - cmdline_options = get_cli_kernel_options( - f'{target_config_dir}/config.boot') - target_ssh_dir: str = f'{root_dir}/boot/{image_name}/rw/etc/ssh/' if no_prompt or copy_ssh_host_keys(): print('Copying SSH host keys') |