|
 |
17b0f1 |
From 60545c63716ecc720728c221c61d575b267fbfc8 Mon Sep 17 00:00:00 2001
|
|
|
17b0f1 |
From: Michal Schmidt <mschmidt@redhat.com>
|
|
|
17b0f1 |
Date: Tue, 21 Jul 2015 15:51:16 +0200
|
|
|
17b0f1 |
Subject: [PATCH] core: remove generic job completion messages from unit
|
|
|
17b0f1 |
vtables
|
|
|
17b0f1 |
|
|
|
17b0f1 |
These units' message format strings are identical to the generic
|
|
|
17b0f1 |
strings. Since we can always rely on the fallback, these are now
|
|
|
17b0f1 |
redundant.
|
|
|
17b0f1 |
|
|
|
17b0f1 |
(cherry picked from commit c382d69e3d39daedebcedb2da882beeb147a3cda)
|
|
|
17b0f1 |
|
|
|
17b0f1 |
Related: #1506256
|
|
|
17b0f1 |
---
|
|
|
17b0f1 |
src/core/automount.c | 1 -
|
|
|
17b0f1 |
src/core/busname.c | 3 ---
|
|
|
17b0f1 |
src/core/mount.c | 1 -
|
|
|
17b0f1 |
src/core/service.c | 3 ---
|
|
|
17b0f1 |
src/core/slice.c | 1 -
|
|
|
17b0f1 |
src/core/socket.c | 1 -
|
|
|
17b0f1 |
src/core/swap.c | 1 -
|
|
|
17b0f1 |
src/core/target.c | 1 -
|
|
|
17b0f1 |
8 files changed, 12 deletions(-)
|
|
|
17b0f1 |
|
|
|
17b0f1 |
diff --git a/src/core/automount.c b/src/core/automount.c
|
|
|
17b0f1 |
index 679fe071e7..08519e49ca 100644
|
|
|
17b0f1 |
--- a/src/core/automount.c
|
|
|
17b0f1 |
+++ b/src/core/automount.c
|
|
|
17b0f1 |
@@ -1126,7 +1126,6 @@ const UnitVTable automount_vtable = {
|
|
|
17b0f1 |
.finished_start_job = {
|
|
|
17b0f1 |
[JOB_DONE] = "Set up automount %s.",
|
|
|
17b0f1 |
[JOB_FAILED] = "Failed to set up automount %s.",
|
|
|
17b0f1 |
- [JOB_DEPENDENCY] = "Dependency failed for %s.",
|
|
|
17b0f1 |
},
|
|
|
17b0f1 |
.finished_stop_job = {
|
|
|
17b0f1 |
[JOB_DONE] = "Unset automount %s.",
|
|
|
17b0f1 |
diff --git a/src/core/busname.c b/src/core/busname.c
|
|
|
17b0f1 |
index f626ba96d0..a5e659049d 100644
|
|
|
17b0f1 |
--- a/src/core/busname.c
|
|
|
17b0f1 |
+++ b/src/core/busname.c
|
|
|
17b0f1 |
@@ -1064,13 +1064,10 @@ const UnitVTable busname_vtable = {
|
|
|
17b0f1 |
.finished_start_job = {
|
|
|
17b0f1 |
[JOB_DONE] = "Listening on %s.",
|
|
|
17b0f1 |
[JOB_FAILED] = "Failed to listen on %s.",
|
|
|
17b0f1 |
- [JOB_DEPENDENCY] = "Dependency failed for %s.",
|
|
|
17b0f1 |
- [JOB_TIMEOUT] = "Timed out starting %s.",
|
|
|
17b0f1 |
},
|
|
|
17b0f1 |
.finished_stop_job = {
|
|
|
17b0f1 |
[JOB_DONE] = "Closed %s.",
|
|
|
17b0f1 |
[JOB_FAILED] = "Failed stopping %s.",
|
|
|
17b0f1 |
- [JOB_TIMEOUT] = "Timed out stopping %s.",
|
|
|
17b0f1 |
},
|
|
|
17b0f1 |
},
|
|
|
17b0f1 |
};
|
|
|
17b0f1 |
diff --git a/src/core/mount.c b/src/core/mount.c
|
|
|
17b0f1 |
index f726d96591..0dc67dde69 100644
|
|
|
17b0f1 |
--- a/src/core/mount.c
|
|
|
17b0f1 |
+++ b/src/core/mount.c
|
|
|
17b0f1 |
@@ -1978,7 +1978,6 @@ const UnitVTable mount_vtable = {
|
|
|
17b0f1 |
.finished_start_job = {
|
|
|
17b0f1 |
[JOB_DONE] = "Mounted %s.",
|
|
|
17b0f1 |
[JOB_FAILED] = "Failed to mount %s.",
|
|
|
17b0f1 |
- [JOB_DEPENDENCY] = "Dependency failed for %s.",
|
|
|
17b0f1 |
[JOB_TIMEOUT] = "Timed out mounting %s.",
|
|
|
17b0f1 |
},
|
|
|
17b0f1 |
.finished_stop_job = {
|
|
|
17b0f1 |
diff --git a/src/core/service.c b/src/core/service.c
|
|
|
17b0f1 |
index 9622ce11ff..8303a1e7ee 100644
|
|
|
17b0f1 |
--- a/src/core/service.c
|
|
|
17b0f1 |
+++ b/src/core/service.c
|
|
|
17b0f1 |
@@ -3398,13 +3398,10 @@ const UnitVTable service_vtable = {
|
|
|
17b0f1 |
.finished_start_job = {
|
|
|
17b0f1 |
[JOB_DONE] = "Started %s.",
|
|
|
17b0f1 |
[JOB_FAILED] = "Failed to start %s.",
|
|
|
17b0f1 |
- [JOB_DEPENDENCY] = "Dependency failed for %s.",
|
|
|
17b0f1 |
- [JOB_TIMEOUT] = "Timed out starting %s.",
|
|
|
17b0f1 |
},
|
|
|
17b0f1 |
.finished_stop_job = {
|
|
|
17b0f1 |
[JOB_DONE] = "Stopped %s.",
|
|
|
17b0f1 |
[JOB_FAILED] = "Stopped (with error) %s.",
|
|
|
17b0f1 |
- [JOB_TIMEOUT] = "Timed out stopping %s.",
|
|
|
17b0f1 |
},
|
|
|
17b0f1 |
},
|
|
|
17b0f1 |
};
|
|
|
17b0f1 |
diff --git a/src/core/slice.c b/src/core/slice.c
|
|
|
17b0f1 |
index 9154558b7b..1cce3e1217 100644
|
|
|
17b0f1 |
--- a/src/core/slice.c
|
|
|
17b0f1 |
+++ b/src/core/slice.c
|
|
|
17b0f1 |
@@ -299,7 +299,6 @@ const UnitVTable slice_vtable = {
|
|
|
17b0f1 |
.status_message_formats = {
|
|
|
17b0f1 |
.finished_start_job = {
|
|
|
17b0f1 |
[JOB_DONE] = "Created slice %s.",
|
|
|
17b0f1 |
- [JOB_DEPENDENCY] = "Dependency failed for %s.",
|
|
|
17b0f1 |
},
|
|
|
17b0f1 |
.finished_stop_job = {
|
|
|
17b0f1 |
[JOB_DONE] = "Removed slice %s.",
|
|
|
17b0f1 |
diff --git a/src/core/socket.c b/src/core/socket.c
|
|
|
17b0f1 |
index 771af0d241..efefe7ce5d 100644
|
|
|
17b0f1 |
--- a/src/core/socket.c
|
|
|
17b0f1 |
+++ b/src/core/socket.c
|
|
|
17b0f1 |
@@ -2736,7 +2736,6 @@ const UnitVTable socket_vtable = {
|
|
|
17b0f1 |
.finished_start_job = {
|
|
|
17b0f1 |
[JOB_DONE] = "Listening on %s.",
|
|
|
17b0f1 |
[JOB_FAILED] = "Failed to listen on %s.",
|
|
|
17b0f1 |
- [JOB_DEPENDENCY] = "Dependency failed for %s.",
|
|
|
17b0f1 |
[JOB_TIMEOUT] = "Timed out starting %s.",
|
|
|
17b0f1 |
},
|
|
|
17b0f1 |
.finished_stop_job = {
|
|
|
17b0f1 |
diff --git a/src/core/swap.c b/src/core/swap.c
|
|
|
17b0f1 |
index 984be2d9a9..e71de4e657 100644
|
|
|
17b0f1 |
--- a/src/core/swap.c
|
|
|
17b0f1 |
+++ b/src/core/swap.c
|
|
|
17b0f1 |
@@ -1525,7 +1525,6 @@ const UnitVTable swap_vtable = {
|
|
|
17b0f1 |
.finished_start_job = {
|
|
|
17b0f1 |
[JOB_DONE] = "Activated swap %s.",
|
|
|
17b0f1 |
[JOB_FAILED] = "Failed to activate swap %s.",
|
|
|
17b0f1 |
- [JOB_DEPENDENCY] = "Dependency failed for %s.",
|
|
|
17b0f1 |
[JOB_TIMEOUT] = "Timed out activating swap %s.",
|
|
|
17b0f1 |
},
|
|
|
17b0f1 |
.finished_stop_job = {
|
|
|
17b0f1 |
diff --git a/src/core/target.c b/src/core/target.c
|
|
|
17b0f1 |
index 2411a8e758..45248ad025 100644
|
|
|
17b0f1 |
--- a/src/core/target.c
|
|
|
17b0f1 |
+++ b/src/core/target.c
|
|
|
17b0f1 |
@@ -231,7 +231,6 @@ const UnitVTable target_vtable = {
|
|
|
17b0f1 |
.status_message_formats = {
|
|
|
17b0f1 |
.finished_start_job = {
|
|
|
17b0f1 |
[JOB_DONE] = "Reached target %s.",
|
|
|
17b0f1 |
- [JOB_DEPENDENCY] = "Dependency failed for %s.",
|
|
|
17b0f1 |
},
|
|
|
17b0f1 |
.finished_stop_job = {
|
|
|
17b0f1 |
[JOB_DONE] = "Stopped target %s.",
|