summaryrefslogtreecommitdiff
path: root/ui/qt5
diff options
context:
space:
mode:
Diffstat (limited to 'ui/qt5')
-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 {
/* !? */