File sddm-wait-for-display-script.patch of Package sddm

Overview Repositories Revisions Requests Users Attributes Meta

File sddm-wait-for-display-script.patch of Package sddm (Revision 5aca468cda4787592dcedddcf9dc0d94)

Currently displaying revision 5aca468cda4787592dcedddcf9dc0d94 , Show latest

From 7ed4ab11656c4b75f278b34883f4e28598b2b13a Mon Sep 17 00:00:00 2001
From: Robert Xu <robxu9@gmail.com>
Date: Wed, 14 Jan 2015 20:00:36 -0600
Subject: [PATCH 1/2] wait for the display script to complete

Signed-off-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
---
 src/daemon/XorgDisplayServer.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
index 2b431ca..b0da10f 100644
--- a/src/daemon/XorgDisplayServer.cpp
+++ b/src/daemon/XorgDisplayServer.cpp
@@ -290,6 +290,7 @@ namespace SDDM {
         // start display setup script
         qDebug() << "Running display setup script " << displayCommand;
         displayScript->start(displayCommand);
+        displayScript->waitForFinished(-1);
     }
 
     void XorgDisplayServer::changeOwner(const QString &fileName) {
-- 
2.5.0

From f083c1e9c7f675bd46589e522e1747e9ee77d2a3 Mon Sep 17 00:00:00 2001
From: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Date: Wed, 24 Jun 2015 22:13:33 +0200
Subject: [PATCH 2/2] Wait for display setup script no more than 30s

Kill the script if it takes long.
---
 src/daemon/XorgDisplayServer.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
index b0da10f..15180e0 100644
--- a/src/daemon/XorgDisplayServer.cpp
+++ b/src/daemon/XorgDisplayServer.cpp
@@ -290,7 +290,10 @@ namespace SDDM {
         // start display setup script
         qDebug() << "Running display setup script " << displayCommand;
         displayScript->start(displayCommand);
-        displayScript->waitForFinished(-1);
+
+        // wait for finished
+        if (!displayScript->waitForFinished(30000))
+            displayScript->kill();
     }
 
     void XorgDisplayServer::changeOwner(const QString &fileName) {
-- 
2.5.0

Places

File sddm-wait-for-display-script.patch of Package sddm (Revision 5aca468cda4787592dcedddcf9dc0d94)

Places