Verified Commit f269dabe authored by A. Wilcox's avatar A. Wilcox

Fix network state issue on live installs, and firmware install

parent 993d5eec
Pipeline #682 passed with stages
in 1 minute and 44 seconds
......@@ -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;
......
......@@ -139,7 +139,7 @@ bool add_default_repos(std::vector<std::unique_ptr<Repository>> &repos,
if(firmware) {
Repository *fw_key = dynamic_cast<Repository *>(
Repository::parseFromData(
"https://distfiles.apkfission.net/adelie-stable/nonfree",
"https://distfiles.apkfission.net/adelie/1.0/nonfree",
{"internal", 0}, nullptr, nullptr, s
)
);
......
......@@ -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";
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment