summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2020-06-13 01:29:03 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2020-06-13 01:29:03 -0500
commit95d1635be3f65ac35f07e8f33f51af2912ba1ec2 (patch)
tree7cdffb6c192c07f73caa1b586cb9a79d98c4e0f3
parenta837ea28e986c8e2f49c470d647cd63f89cf8254 (diff)
downloadhorizon-95d1635be3f65ac35f07e8f33f51af2912ba1ec2.tar.gz
horizon-95d1635be3f65ac35f07e8f33f51af2912ba1ec2.tar.bz2
horizon-95d1635be3f65ac35f07e8f33f51af2912ba1ec2.tar.xz
horizon-95d1635be3f65ac35f07e8f33f51af2912ba1ec2.zip
Qt UI: Execute: Workaround for network issue
-rw-r--r--ui/qt5/runner/executepage.cc17
1 files changed, 16 insertions, 1 deletions
diff --git a/ui/qt5/runner/executepage.cc b/ui/qt5/runner/executepage.cc
index 7567597..0d0980a 100644
--- a/ui/qt5/runner/executepage.cc
+++ b/ui/qt5/runner/executepage.cc
@@ -122,7 +122,22 @@ void ExecutePage::processMessages() {
} else if(msgType == "log") {
QString severity = msg.section(": ", 1, 1);
if(severity == "error") {
- markFailed(this->current);
+ /* Workaround for:
+ * - this computer uses DHCP networking
+ * - the UI already configured DHCP networking
+ * - we can't kill dhcpcd that was spawned by horizon-qt5,
+ * because this may be a captive portal that had to be
+ * authenticated to
+ * - when `service net.eth0 start` is run, dhcpcd is already
+ * running
+ * - this makes it appear the installation failed later on
+ * when the installation completed successfully, because of
+ * the spurious error reported by launching `service`.
+ */
+ if(!(this->current == Net &&
+ msg.endsWith("service: error: exited abnormally with status 1"))) {
+ markFailed(this->current);
+ }
}
} else {
/* !? */