From f269dabec9ea44084692991877eacda60d78c355 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Wed, 24 Jun 2020 00:39:58 -0500 Subject: Fix network state issue on live installs, and firmware install --- hscript/script_e.cc | 6 +++++- hscript/script_v.cc | 2 +- ui/qt5/horizonwizard.cc | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hscript/script_e.cc b/hscript/script_e.cc index cf004a0..b8087e6 100644 --- a/hscript/script_e.cc +++ b/hscript/script_e.cc @@ -485,7 +485,11 @@ bool Script::execute() const { + iface, ec.message()); EXECUTE_FAILURE("network"); } else { - run_command("service", {"net." + iface, "start"}); + std::ifstream statefs("/sys/class/net/" + iface + "/operstate"); + char state; + statefs.read(&state, 1); + if(state != 'u') + run_command("service", {"net." + iface, "start"}); } } break; diff --git a/hscript/script_v.cc b/hscript/script_v.cc index 0aeaad9..1fc3726 100644 --- a/hscript/script_v.cc +++ b/hscript/script_v.cc @@ -139,7 +139,7 @@ bool add_default_repos(std::vector> &repos, if(firmware) { Repository *fw_key = dynamic_cast( Repository::parseFromData( - "https://distfiles.apkfission.net/adelie-stable/nonfree", + "https://distfiles.apkfission.net/adelie/1.0/nonfree", {"internal", 0}, nullptr, nullptr, s ) ); diff --git a/ui/qt5/horizonwizard.cc b/ui/qt5/horizonwizard.cc index fde0549..6c2ea9e 100644 --- a/ui/qt5/horizonwizard.cc +++ b/ui/qt5/horizonwizard.cc @@ -680,6 +680,8 @@ QString HorizonWizard::toHScript() { #ifdef NON_LIBRE_FIRMWARE if(this->firmware) { lines << "firmware true"; + lines << "signingkey /etc/apk/keys/packages@pleroma.apkfission.net-5ac0b300.rsa.pub"; + lines << "signingkey /etc/apk/keys/packages@pleroma.apkfission.net-5ac04808.rsa.pub"; } else { lines << "firmware false"; } -- cgit v1.2.3-60-g2f50