actually apply buffer types patch from -3epel9
Rex Dieter
4 years ago
parent
d840b5ea7c
commit
22b893aeaa
@ -0,0 +1,68 @@
|
||||
From b0997076c194b1cb72fc4380c8ebbe67b0ebc58a Mon Sep 17 00:00:00 2001
|
||||
From: David Edmundson <kde@davidedmundson.co.uk>
|
||||
Date: Thu, 8 Apr 2021 11:59:44 +0100
|
||||
Subject: [PATCH 279/382] [startkde] Reset systemd failed units on login
|
||||
|
||||
If a service has recently failed multiple times, systemd will (quite
|
||||
cleverly) not restart it. This includes DBus activation so is indepdent
|
||||
of the systemd boot.
|
||||
|
||||
If a service gets into a broken state on a previous session where ithas
|
||||
different environment variables and a different display server, we
|
||||
shouldn't treat it as failed for a new session.
|
||||
|
||||
This shouldn't be needed with the other recent fixes, but it seems like
|
||||
a good practice nevertheless.
|
||||
|
||||
Gnome are doing something similar:
|
||||
https://gitlab.gnome.org/GNOME/gnome-session/-/blob/master/gnome-session/main.c#L565
|
||||
---
|
||||
startkde/startplasma.cpp | 12 ++++++++++++
|
||||
startkde/startplasma.h | 1 +
|
||||
2 files changed, 13 insertions(+)
|
||||
|
||||
diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
|
||||
index 778242538..997f91e88 100644
|
||||
--- a/startkde/startplasma.cpp
|
||||
+++ b/startkde/startplasma.cpp
|
||||
@@ -447,6 +447,17 @@ QProcess *setupKSplash()
|
||||
return p;
|
||||
}
|
||||
|
||||
+// If something went on an endless restart crash loop it will get blacklisted, as this is a clean login we will want to reset those counters
|
||||
+// This is independent of whether we use the Plasma systemd boot
|
||||
+void resetSystemdFailedUnits()
|
||||
+{
|
||||
+ QDBusMessage message = QDBusMessage::createMethodCall(QStringLiteral("org.freedesktop.systemd1"),
|
||||
+ QStringLiteral("/org/freedesktop/systemd1"),
|
||||
+ QStringLiteral("org.freedesktop.systemd1.Manager"),
|
||||
+ QStringLiteral("ResetFailed"));
|
||||
+ QDBusConnection::sessionBus().call(message);
|
||||
+}
|
||||
+
|
||||
bool hasSystemdService(const QString &serviceName)
|
||||
{
|
||||
auto msg = QDBusMessage::createMethodCall(QStringLiteral("org.freedesktop.systemd1"),
|
||||
@@ -489,6 +500,7 @@ bool useSystemdBoot()
|
||||
|
||||
bool startPlasmaSession(bool wayland)
|
||||
{
|
||||
+ resetSystemdFailedUnits();
|
||||
OrgKdeKSplashInterface iface(QStringLiteral("org.kde.KSplash"), QStringLiteral("/KSplash"), QDBusConnection::sessionBus());
|
||||
iface.setStage(QStringLiteral("kinit"));
|
||||
// finally, give the session control to the session manager
|
||||
diff --git a/startkde/startplasma.h b/startkde/startplasma.h
|
||||
index 5283ed8e2..40a78a0c2 100644
|
||||
--- a/startkde/startplasma.h
|
||||
+++ b/startkde/startplasma.h
|
||||
@@ -51,6 +51,7 @@ bool startPlasmaSession(bool wayland);
|
||||
|
||||
void waitForKonqi();
|
||||
|
||||
+static void resetSystemdFailedUnits();
|
||||
static bool hasSystemdService(const QString &serviceName);
|
||||
static bool useSystemdBoot();
|
||||
|
||||
--
|
||||
2.31.1
|
||||
|
||||
Loading…
Reference in new issue