diff --git a/src/live/ogOperations.py b/src/live/ogOperations.py index 2f59711..48bb1ee 100644 --- a/src/live/ogOperations.py +++ b/src/live/ogOperations.py @@ -24,7 +24,7 @@ from src.live.parttypes import get_parttype from src.utils.image import * from src.utils.postinstall import configure_os -from src.utils.net import ethtool +from src.utils.net import * from src.utils.menu import generate_menu from src.utils.fs import * from src.utils.probe import os_probe, get_cache_dev_path @@ -343,7 +343,7 @@ class OgLiveOperations: f.truncate(0) def _poweroff_oglive(self, operation='poweroff'): - interface = os.getenv('DEVICE') + interface = get_ethernet_interface() cmd_ethtool = shlex.split(f'ethtool -s {interface} wol g') cmd_browser = shlex.split('pkill -9 browser') if shutil.which('busybox'): @@ -772,7 +772,7 @@ class OgLiveOperations: cache = get_cache_dev_path() disks = get_disks() - interface = os.getenv('DEVICE') + interface = get_ethernet_interface() link = ethtool(interface) json_body = { 'serial_number': '', 'disk_setup': [], diff --git a/src/log.py b/src/log.py index 9478bb7..13c625a 100644 --- a/src/log.py +++ b/src/log.py @@ -9,6 +9,7 @@ import logging import logging.config import os +from src.utils.net import get_ethernet_interface class OgError(Exception): @@ -67,7 +68,7 @@ def _default_logging_live(): 'samba': { 'class': 'logging.FileHandler', 'formatter': 'formatter.syslogtime', - 'filename': f'/opt/opengnsys/log/{getifaddr(os.getenv("DEVICE"))}.log', + 'filename': f'/opt/opengnsys/log/{getifaddr(get_ethernet_interface())}.log', } } rtlog = { diff --git a/src/utils/cache.py b/src/utils/cache.py index 374f8e0..6358c6a 100644 --- a/src/utils/cache.py +++ b/src/utils/cache.py @@ -10,7 +10,7 @@ import logging import os from src.utils.fs import mount_mkdir, umount -from src.utils.net import getifaddr +from src.utils.net import * from src.utils.probe import get_cache_dev_path OG_IMAGE_PATH = '/opt/opengnsys/images/' @@ -45,7 +45,7 @@ def write_cache_txt(content): """ Dumps content to /opt/opengnsys/log/{ip}.cache.txt """ - client_ip = getifaddr(os.getenv('DEVICE')) + client_ip = getifaddr(get_ethernet_interface()) with open(OGCLIENT_LOG_CACHE.format(ip=client_ip), 'w') as f: logging.debug('Writing cache contents to %s.cache.txt', client_ip) f.write(content) diff --git a/src/utils/menu.py b/src/utils/menu.py index 48e2641..b615d6f 100644 --- a/src/utils/menu.py +++ b/src/utils/menu.py @@ -13,7 +13,7 @@ Utility module for ogBrowser menu generation import os import socket -from src.utils.net import getifaddr, getifhwaddr, ethtool +from src.utils.net import * MENU_TEMPLATE = """