mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-25 12:15:32 +03:00
49 lines
1.5 KiB
Diff
49 lines
1.5 KiB
Diff
Only in fwupd-1.2.9.new: output
|
|
diff -ru fwupd-1.2.9/src/fu-tool.c fwupd-1.2.9.new/src/fu-tool.c
|
|
--- fwupd-1.2.9/src/fu-tool.c 2019-05-20 13:17:42.000000000 +0300
|
|
+++ fwupd-1.2.9.new/src/fu-tool.c 2019-06-07 14:50:24.112996194 +0300
|
|
@@ -113,8 +113,10 @@
|
|
{
|
|
g_autoptr(GError) error_local = NULL;
|
|
|
|
+#ifdef HAVE_SYSTEMD
|
|
if (!fu_systemd_unit_stop (fu_util_get_systemd_unit (), &error_local))
|
|
g_debug ("Failed top stop daemon: %s", error_local->message);
|
|
+#endif
|
|
if (!fu_engine_load (priv->engine, flags, error))
|
|
return FALSE;
|
|
if (fu_engine_get_tainted (priv->engine)) {
|
|
diff -ru fwupd-1.2.9/src/fu-util-common.c fwupd-1.2.9.new/src/fu-util-common.c
|
|
--- fwupd-1.2.9/src/fu-util-common.c 2019-05-20 13:17:42.000000000 +0300
|
|
+++ fwupd-1.2.9.new/src/fu-util-common.c 2019-06-07 14:52:03.371845913 +0300
|
|
@@ -15,7 +15,6 @@
|
|
|
|
#ifdef HAVE_SYSTEMD
|
|
#include "fu-systemd.h"
|
|
-#endif
|
|
|
|
#define SYSTEMD_FWUPD_UNIT "fwupd.service"
|
|
#define SYSTEMD_SNAP_FWUPD_UNIT "snap.fwupd.fwupd.service"
|
|
@@ -61,6 +60,7 @@
|
|
|
|
return TRUE;
|
|
}
|
|
+#endif
|
|
|
|
void
|
|
fu_util_print_data (const gchar *title, const gchar *msg)
|
|
diff -ru fwupd-1.2.9/src/fu-util.c fwupd-1.2.9.new/src/fu-util.c
|
|
--- fwupd-1.2.9/src/fu-util.c 2019-05-20 13:17:42.000000000 +0300
|
|
+++ fwupd-1.2.9.new/src/fu-util.c 2019-06-07 14:53:13.841029263 +0300
|
|
@@ -2122,7 +2122,11 @@
|
|
if (!fu_util_prompt_for_boolean (FALSE))
|
|
return TRUE;
|
|
}
|
|
+#ifdef HAVE_SYSTEMD
|
|
return fu_systemd_unit_stop (fu_util_get_systemd_unit (), error);
|
|
+#else
|
|
+ return TRUE;
|
|
+#endif
|
|
}
|
|
|
|
static void
|