File 0001-Adjust-debianisms.patch of Package plymouth-kcm6

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Adjust-debianisms.patch of Package plymouth-kcm6 (Revision 2bde0ac352ca4cb203e863e5db959898)

Currently displaying revision 2bde0ac352ca4cb203e863e5db959898 , Show latest

From 717d4a4fbf9751311c84e7fc08d693144feaedad Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Mon, 1 May 2017 13:34:39 +0200
Subject: [PATCH] Adjust debianisms

- We use dracut
- We have update-alternatives, but don't use it for plymouth
- See also kde#379403
---
 src/helper.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/helper.cpp b/src/helper.cpp
index ca5f592..9e70049 100644
--- a/src/helper.cpp
+++ b/src/helper.cpp
@@ -91,7 +91,7 @@ ActionReply PlymouthHelper::save(const QVariantMap &args)
     configFile.setPermissions(QFileDevice::ReadOwner | QFileDevice::WriteOwner | QFileDevice::ReadGroup | QFileDevice::ReadOther);
 
     // Special case: Ubuntu derivatives, which work different from everybody else
-    if (hasUpdateAlternatives()) {
+    if (false) {
         // find the .plymouth file in the theme
         QDir dir(QStringLiteral(PLYMOUTH_THEMES_DIR) + theme);
         const QStringList themeFile = dir.entryList(QStringList() << QStringLiteral("*.plymouth"));
@@ -155,11 +155,11 @@ ActionReply PlymouthHelper::save(const QVariantMap &args)
 
     QProcess process;
     if (QFileInfo::exists(QStringLiteral("/usr/sbin/update-initramfs"))) {
-        qDebug() << "Running update-initramfs -u now";
-        process.start(QStringLiteral("/usr/sbin/update-initramfs"), QStringList() << QStringLiteral("-u"));
+        qDebug() << "Running dracut -f now";
+        process.start(QStringLiteral("/usr/sbin/dracut"), QStringList() << QStringLiteral("-f"));
         if (!process.waitForStarted()) {
             reply = ActionReply::BackendError;
-            reply.setErrorDescription(i18n("Cannot start initramfs."));
+            reply.setErrorDescription(i18n("Cannot start dracut -f."));
             return reply;
         }
     }
@@ -261,7 +261,7 @@ ActionReply PlymouthHelper::install(const QVariantMap &args)
     archive->close();
 
     // Special case: Ubuntu derivatives, which work different from everybody else
-    if (hasUpdateAlternatives()) {
+    if (false) {
         // find the .plymouth file in the theme
         QDir dir(themePath);
         const QStringList themeFile = dir.entryList({QStringLiteral("*.plymouth")});
-- 
2.41.0

Places

File 0001-Adjust-debianisms.patch of Package plymouth-kcm6 (Revision 2bde0ac352ca4cb203e863e5db959898)

Places