diff --git a/rootfs/standard/usr/bin/mynode_check_in.py b/rootfs/standard/usr/bin/mynode_check_in.py index 5ae6cd21..4b2e66ad 100755 --- a/rootfs/standard/usr/bin/mynode_check_in.py +++ b/rootfs/standard/usr/bin/mynode_check_in.py @@ -79,6 +79,7 @@ def check_in(): "serial": get_device_serial(), "device_type": get_device_type(), "device_arch": get_device_arch(), + "debian_version": get_debian_version(), "version": get_current_version(), "product_key": product_key, "drive_size": get_mynode_drive_size(), diff --git a/rootfs/standard/usr/bin/mynode_premium_plus_connect.py b/rootfs/standard/usr/bin/mynode_premium_plus_connect.py index fbbdbbda..8517f25d 100755 --- a/rootfs/standard/usr/bin/mynode_premium_plus_connect.py +++ b/rootfs/standard/usr/bin/mynode_premium_plus_connect.py @@ -31,6 +31,7 @@ def get_premium_plus_device_info(): info["serial"] = get_device_serial() info["device_type"] = get_device_type() info["device_arch"] = get_device_arch() + info["debian_version"] = get_debian_version() info["drive_size"] = get_mynode_drive_size() info["data_drive_usage"] = get_data_drive_usage() info["os_drive_usage"] = get_os_drive_usage() diff --git a/rootfs/standard/usr/share/mynode/mynode_device_info.sh b/rootfs/standard/usr/share/mynode/mynode_device_info.sh index 96fd96b1..e3ac5c4f 100644 --- a/rootfs/standard/usr/share/mynode/mynode_device_info.sh +++ b/rootfs/standard/usr/share/mynode/mynode_device_info.sh @@ -14,6 +14,7 @@ IS_32_BIT=0 IS_64_BIT=0 DEVICE_TYPE="unknown" MODEL=$(tr -d '\0' < /proc/device-tree/model) || MODEL="unknown" +DEBIAN_VERSION=$(lsb_release -c -s) || DEBIAN_VERSION="unknown" uname -a | grep amd64 && IS_X86=1 && IS_64_BIT=1 || true if [[ $MODEL == *"Rock64"* ]]; then IS_ARMBIAN=1 diff --git a/rootfs/standard/var/pynode/device_info.py b/rootfs/standard/var/pynode/device_info.py index d31259d7..aa066c5c 100644 --- a/rootfs/standard/var/pynode/device_info.py +++ b/rootfs/standard/var/pynode/device_info.py @@ -313,6 +313,15 @@ def get_device_arch(): cached_data["device_arch"] = arch return arch +def get_debian_version(): + global cached_data + if "debian_version" in cached_data: + return cached_data["debian_version"] + + debian_version = to_string(subprocess.check_output("lsb_release -c -s", shell=True).decode("utf-8").strip()) + cached_data["debian_version"] = debian_version + return debian_version + def get_device_ram(): global cached_data if "ram" in cached_data: diff --git a/rootfs/standard/var/www/mynode/settings.py b/rootfs/standard/var/www/mynode/settings.py index 1659a29c..3c5896a4 100644 --- a/rootfs/standard/var/www/mynode/settings.py +++ b/rootfs/standard/var/www/mynode/settings.py @@ -31,9 +31,6 @@ def page_settings(): latest_beta_version = get_latest_beta_version() changelog = get_device_changelog() - serial_number = get_device_serial() - device_type = get_device_type() - device_arch = get_device_arch() device_ram = get_device_ram() product_key = get_product_key() product_key_skipped = skipped_product_key() @@ -66,9 +63,10 @@ def page_settings(): "upgrade_error": did_upgrade_fail(), "upgrade_log": get_recent_upgrade_log(), "upgrade_logs": get_all_upgrade_logs(), - "serial_number": serial_number, - "device_type": device_type, - "device_arch": device_arch, + "serial_number": get_device_serial(), + "device_type": get_device_type(), + "device_arch": get_device_arch(), + "debian_version": get_debian_version(), "device_ram": device_ram, "swap_size": get_swap_size(), "check_in_data": get_check_in_data(), @@ -130,9 +128,6 @@ def page_status(): latest_beta_version = get_latest_beta_version() changelog = get_device_changelog() - serial_number = get_device_serial() - device_type = get_device_type() - device_arch = get_device_arch() device_ram = get_device_ram() product_key = get_product_key() product_key_skipped = skipped_product_key() @@ -141,7 +136,6 @@ def page_status(): date = get_system_date() local_ip = get_local_ip() - # Get Startup Status #startup_status_log = get_journalctl_log("mynode") @@ -190,9 +184,10 @@ def page_status(): "has_checkin_error": has_checkin_error(), "upgrade_error": did_upgrade_fail(), "upgrade_logs": get_recent_upgrade_log(), - "serial_number": serial_number, - "device_type": device_type, - "device_arch": device_arch, + "serial_number": get_device_serial(), + "device_type": get_device_type(), + "device_arch": get_device_arch(), + "debian_version": get_debian_version(), "device_ram": device_ram, "check_in_data": get_check_in_data(), "product_key": product_key, diff --git a/rootfs/standard/var/www/mynode/templates/includes/info_table.html b/rootfs/standard/var/www/mynode/templates/includes/info_table.html index 93f7154d..8a6c0b9d 100644 --- a/rootfs/standard/var/www/mynode/templates/includes/info_table.html +++ b/rootfs/standard/var/www/mynode/templates/includes/info_table.html @@ -1,7 +1,7 @@
Info
- +
@@ -112,6 +112,22 @@ {% endif %} + + + + + + + + + + + + + +
Serial Number {{serial_number}}Error contacting mynodebtc.com via Tor!
You may have issues checking for new versions or saving product keys.
Advanced Info + +
\ No newline at end of file diff --git a/rootfs/standard/var/www/mynode/templates/settings.html b/rootfs/standard/var/www/mynode/templates/settings.html index bda7f869..9aa1d058 100644 --- a/rootfs/standard/var/www/mynode/templates/settings.html +++ b/rootfs/standard/var/www/mynode/templates/settings.html @@ -366,6 +366,19 @@ ); }); + showing_info_table_advanced_rows=0; + $("#info_table_show_advanced_info").on("click", function() { + if (showing_info_table_advanced_rows) { + $("#info_table_show_advanced_info").html("Show"); + $(".info_table_advanced_row").hide(); + showing_info_table_advanced_rows = 0; + } else { + $("#info_table_show_advanced_info").html("Hide"); + $(".info_table_advanced_row").show(); + showing_info_table_advanced_rows = 1; + } + }); + $("#glances").on("click", function() { port="61208"; if (location.protocol == "https:") { diff --git a/rootfs/standard/var/www/mynode/templates/status.html b/rootfs/standard/var/www/mynode/templates/status.html index 8f1c039c..eba4b4a4 100644 --- a/rootfs/standard/var/www/mynode/templates/status.html +++ b/rootfs/standard/var/www/mynode/templates/status.html @@ -45,6 +45,19 @@ } }); + showing_info_table_advanced_rows=0; + $("#info_table_show_advanced_info").on("click", function() { + if (showing_info_table_advanced_rows) { + $("#info_table_show_advanced_info").html("Show"); + $(".info_table_advanced_row").hide(); + showing_info_table_advanced_rows = 0; + } else { + $("#info_table_show_advanced_info").html("Hide"); + $(".info_table_advanced_row").show(); + showing_info_table_advanced_rows = 1; + } + }); + $("#glances").on("click", function() { port="61208"; if (location.protocol == "https:") {