anitazha / rpms / systemd

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