From 59a5c764e64200657fa1a782ef4af1c8e1c5d347 Mon Sep 17 00:00:00 2001 From: usmannasir Date: Thu, 28 Mar 2024 12:54:45 +0400 Subject: [PATCH] bug fix: https://github.com/usmannasir/cyberpanel/issues/1237 and https://community.cyberpanel.net/t/arm64-slow-reboot-waiting-for-process-lscpd/52280 --- install/install.py | 20 ++++++++++---------- plogical/upgrade.py | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/install/install.py b/install/install.py index b4f4d6c5d..9a474b20f 100755 --- a/install/install.py +++ b/install/install.py @@ -1572,21 +1572,21 @@ $cfg['Servers'][$i]['LogoutURL'] = 'phpmyadminsignin.php?logout'; result = subprocess.run('uname -a', capture_output=True, text=True, shell=True) if result.stdout.find('aarch64') == -1: - lscpdSelection = 'lscpd-0.4.1' - if os.path.exists('/etc/lsb-release'): - result = open('/etc/lsb-release', 'r').read() - if result.find('22.04') > -1: - lscpdSelection = 'lscpd.0.4.1' + lscpdSelection = 'lscpd.0.4.1' + # if os.path.exists('/etc/lsb-release'): + # result = open('/etc/lsb-release', 'r').read() + # if result.find('22.04') > -1: + # lscpdSelection = 'lscpd.0.4.1' else: lscpdSelection = 'lscpd.aarch64.0.4.1' except: - lscpdSelection = 'lscpd-0.4.1' - if os.path.exists('/etc/lsb-release'): - result = open('/etc/lsb-release', 'r').read() - if result.find('22.04') > -1: - lscpdSelection = 'lscpd.0.4.1' + lscpdSelection = 'lscpd.0.4.1' + # if os.path.exists('/etc/lsb-release'): + # result = open('/etc/lsb-release', 'r').read() + # if result.find('22.04') > -1: + # lscpdSelection = 'lscpd.0.4.1' command = f'cp -f /usr/local/CyberCP/{lscpdSelection} /usr/local/lscp/bin/{lscpdSelection}' diff --git a/plogical/upgrade.py b/plogical/upgrade.py index 05738c3e8..4d7292ccb 100755 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -2240,21 +2240,21 @@ CREATE TABLE `websiteFunctions_backupsv2` (`id` integer AUTO_INCREMENT NOT NULL result = subprocess.run('uname -a', capture_output=True, text=True, shell=True) if result.stdout.find('aarch64') == -1: - lscpdSelection = 'lscpd-0.4.1' - if os.path.exists(Upgrade.UbuntuPath): - result = open(Upgrade.UbuntuPath, 'r').read() - if result.find('22.04') > -1: - lscpdSelection = 'lscpd.0.4.1' + lscpdSelection = 'lscpd.0.4.1' + # if os.path.exists(Upgrade.UbuntuPath): + # result = open(Upgrade.UbuntuPath, 'r').read() + # if result.find('22.04') > -1: + # lscpdSelection = 'lscpd.0.4.1' else: lscpdSelection = 'lscpd.aarch64.0.4.1' except: - lscpdSelection = 'lscpd-0.4.1' - if os.path.exists(Upgrade.UbuntuPath): - result = open(Upgrade.UbuntuPath, 'r').read() - if result.find('22.04') > -1: - lscpdSelection = 'lscpd.0.4.1' + lscpdSelection = 'lscpd.0.4.1' + # if os.path.exists(Upgrade.UbuntuPath): + # result = open(Upgrade.UbuntuPath, 'r').read() + # if result.find('22.04') > -1: + # lscpdSelection = 'lscpd.0.4.1' command = f'cp -f /usr/local/CyberCP/{lscpdSelection} /usr/local/lscp/bin/{lscpdSelection}' Upgrade.executioner(command, command, 0)