48k.eu-mirror
/
ogclient
mirror of https://git.48k.eu/ogclient
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

live: rewrite reboot operation 

Add optional 'operation' parameter to _poweroff_oglive function.
Reuse _poweroff_oglive code before the busybox subprocess when rebooting
an ogLive client.
more_events v1.2.9
Jose M. Guisado 2023-05-04 12:56:26 +02:00
parent ef06618a8c
commit 66a464f7d0
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/live/ogOperations.py
View File

@ -190,7 +190,7 @@ class OgLiveOperations:
with open(logfile, 'wb', 0) as f: with open(logfile, 'wb', 0) as f:
f.truncate(0) f.truncate(0)
def _poweroff_oglive(self): def _poweroff_oglive(self, operation='poweroff'):
interface = os.getenv('DEVICE') interface = os.getenv('DEVICE')
cmd_ethtool = shlex.split(f'ethtool -s {interface} wol g') cmd_ethtool = shlex.split(f'ethtool -s {interface} wol g')
cmd_browser = shlex.split('pkill -9 browser') cmd_browser = shlex.split('pkill -9 browser')
@ -198,7 +198,7 @@ class OgLiveOperations:
busybox = 'busybox' busybox = 'busybox'
else: else:
busybox = shutil.which('busyboxOLD') busybox = shutil.which('busyboxOLD')
cmd_busybox = shlex.split(f'{busybox} poweroff') cmd_busybox = shlex.split(f'{busybox} {operation}')
umount_all() umount_all()
umount_cache() umount_cache()
@ -219,9 +219,7 @@ class OgLiveOperations:
def reboot(self): def reboot(self):
logging.info('Rebooting client') logging.info('Rebooting client')
if os.path.exists('/scripts/oginit'): if os.path.exists('/scripts/oginit'):
cmd = f'source {ogClient.OG_PATH}etc/preinit/loadenviron.sh; ' \ self._poweroff_oglive(operation='reboot')
f'{ogClient.OG_PATH}scripts/reboot'
subprocess.call([cmd], shell=True, executable=OG_SHELL)
else: else:
subprocess.call(['/sbin/reboot']) subprocess.call(['/sbin/reboot'])