diff options
| -rw-r--r-- | src/live/ogOperations.py | 26 | ||||
| -rw-r--r-- | src/utils/boot.py | 14 |
2 files changed, 10 insertions, 30 deletions
diff --git a/src/live/ogOperations.py b/src/live/ogOperations.py index 339c58c..acb1a0e 100644 --- a/src/live/ogOperations.py +++ b/src/live/ogOperations.py @@ -36,8 +36,6 @@ from src.utils.boot import * from src.utils.sw_inventory import get_package_set from src.utils.hw_inventory import get_hardware_inventory, legacy_list_hardware_inventory -from src.ogClient import ogClient -from src.utils.probe import OSFamily, get_os_family OG_SHELL = '/bin/bash' OG_CACHE_PATH = '/opt/opengnsys/cache/opt/opengnsys/images' @@ -267,30 +265,6 @@ class OgLiveOperations: disk = request.getDisk() partition = request.getPartition() - device = get_partition_device(int(disk), int(partition)) - mountpoint = device.replace('dev', 'mnt') - - if not mount_mkdir(device, mountpoint): - raise RuntimeError(f'Cannot probe OS family. Unable to mount {device} at {esp_mountpoint}.') - is_legacy = not is_uefi_supported(disk) and get_os_family(mountpoint) == OSFamily.WINDOWS - umount(mountpoint) - - if is_legacy: - cmd = f'{ogClient.OG_PATH}interfaceAdm/IniciarSesion {disk} {partition}' - - try: - ogRest.proc = subprocess.Popen([cmd], - stdout=subprocess.PIPE, - shell=True, - executable=OG_SHELL) - (output, error) = ogRest.proc.communicate() - except: - logging.exception('Exception when running session subprocess') - raise ValueError('Error: Incorrect command value') - - logging.info('Starting OS at disk %s partition %s', disk, partition) - return output.decode('utf-8') - boot_os_at(int(disk), int(partition)) self.reboot() diff --git a/src/utils/boot.py b/src/utils/boot.py index 724fc06..a5ff04b 100644 --- a/src/utils/boot.py +++ b/src/utils/boot.py @@ -19,9 +19,6 @@ from src.utils.uefi import * from src.utils.fs import * -def _boot_bios_legacy(disk, part, mountpoint): - raise NotImplementedError - def _boot_bios_linux(disk, part, mountpoint): logging.info(f'Booting Linux system') @@ -47,7 +44,16 @@ def _boot_bios_linux(disk, part, mountpoint): def _boot_bios_windows(disk, part, mountpoint): logging.info(f'Booting Windows system') - _boot_bios_legacy(disk, part, mountpoint) + try: + with open(f'{mountpoint}/ogboot.me', 'w') as f: + f.write('\0' * (3072)) + with open(f'{mountpoint}/ogboot.firstboot', 'w') as f: + f.write('iniciado') + f.write('\0' * (3072 - 8)) + with open(f'{mountpoint}/ogboot.secondboot', 'w') as f: + f.write('\0' * (3072)) + except OSError as e: + raise RuntimeError(f'Could not create ogboot files in Windows partition: {e}') def _boot_uefi_windows(disk, part, mountpoint): logging.info(f'Booting windows system') |