Skip to content

Commit

Permalink
installer: T7034: fail the upgrade if image flavors do not match
Browse files Browse the repository at this point in the history
  • Loading branch information
dmbaturin committed Jan 9, 2025
1 parent 726dcee commit 3f26685
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/op_mode/image_installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
MSG_ERR_NO_DISK: str = 'No suitable disk was found. There must be at least one disk of 2GB or greater size.'
MSG_ERR_IMPROPER_IMAGE: str = 'Missing sha256sum.txt.\nEither this image is corrupted, or of era 1.2.x (md5sum) and would downgrade image tools;\ndisallowed in either case.'
MSG_ERR_ARCHITECTURE_MISMATCH: str = 'Upgrading to a different image architecture will break your system.'
MSG_ERR_FLAVOR_MISMATCH: str = 'The current image flavor is "{0}", the new image is "{1}". Upgrading to a non-matching flavor can have unpredictable consequences.'
MSG_INFO_INSTALL_WELCOME: str = 'Welcome to VyOS installation!\nThis command will install VyOS to your permanent storage.'
MSG_INFO_INSTALL_EXIT: str = 'Exiting from VyOS installation'
MSG_INFO_INSTALL_SUCCESS: str = 'The image installed successfully; please reboot now.'
Expand Down Expand Up @@ -79,7 +80,6 @@
MSG_WARN_IMAGE_NAME_WRONG: str = 'The suggested name is unsupported!\n'\
'It must be between 1 and 64 characters long and contains only the next characters: .+-_ a-z A-Z 0-9'
MSG_WARN_PASSWORD_CONFIRM: str = 'The entered values did not match. Try again'
MSG_WARN_FLAVOR_MISMATCH: str = 'The running image flavor is "{0}". The new image flavor is "{1}".\n' \
'Installing a different image flavor may cause functionality degradation or break your system.\n' \
'Do you want to continue with installation?'
CONST_MIN_DISK_SIZE: int = 2147483648 # 2 GB
Expand Down Expand Up @@ -721,9 +721,9 @@ def validate_compatibility(iso_path: str) -> None:
exit(MSG_INFO_INSTALL_EXIT)

if not old_flavor == new_flavor:
if not ask_yes_no(MSG_WARN_FLAVOR_MISMATCH.format(old_flavor, new_flavor), default=False):
cleanup()
exit(MSG_INFO_INSTALL_EXIT)
print(MSG_ERR_FLAVOR_MISMATCH.format(old_flavor, new_flavor))
cleanup()
exit(MSG_INFO_INSTALL_EXIT)


def install_image() -> None:
Expand Down

0 comments on commit 3f26685

Please sign in to comment.