]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
core: remove generic job completion messages from unit vtables
authorMichal Schmidt <mschmidt@redhat.com>
Tue, 21 Jul 2015 13:51:16 +0000 (15:51 +0200)
committerMichal Schmidt <mschmidt@redhat.com>
Tue, 21 Jul 2015 17:24:20 +0000 (19:24 +0200)
These units' message format strings are identical to the generic
strings. Since we can always rely on the fallback, these are now
redundant.

src/core/automount.c
src/core/busname.c
src/core/mount.c
src/core/service.c
src/core/slice.c
src/core/socket.c
src/core/swap.c
src/core/target.c

index d847dc1629d7f5f8f001af1addea299ac9512345..90b331f70ea19c2ed45ac8d96ef9d33bb0619dd1 100644 (file)
@@ -1066,7 +1066,6 @@ const UnitVTable automount_vtable = {
                 .finished_start_job = {
                         [JOB_DONE]       = "Set up automount %s.",
                         [JOB_FAILED]     = "Failed to set up automount %s.",
-                        [JOB_DEPENDENCY] = "Dependency failed for %s.",
                 },
                 .finished_stop_job = {
                         [JOB_DONE]       = "Unset automount %s.",
index 2085721546fa15c0770ac6475d59fefa22fb20c6..9530a8731178f8de72248d9b1e2e42a00f89a254 100644 (file)
@@ -1065,13 +1065,10 @@ const UnitVTable busname_vtable = {
                 .finished_start_job = {
                         [JOB_DONE]       = "Listening on %s.",
                         [JOB_FAILED]     = "Failed to listen on %s.",
-                        [JOB_DEPENDENCY] = "Dependency failed for %s.",
-                        [JOB_TIMEOUT]    = "Timed out starting %s.",
                 },
                 .finished_stop_job = {
                         [JOB_DONE]       = "Closed %s.",
                         [JOB_FAILED]     = "Failed stopping %s.",
-                        [JOB_TIMEOUT]    = "Timed out stopping %s.",
                 },
         },
 };
index a4fdf2b798a19f1334bdde659a73fa5df47fb14a..bf8e52bf0e9c14d9c8d80656aeea46979bc3c543 100644 (file)
@@ -1897,7 +1897,6 @@ const UnitVTable mount_vtable = {
                 .finished_start_job = {
                         [JOB_DONE]       = "Mounted %s.",
                         [JOB_FAILED]     = "Failed to mount %s.",
-                        [JOB_DEPENDENCY] = "Dependency failed for %s.",
                         [JOB_TIMEOUT]    = "Timed out mounting %s.",
                 },
                 .finished_stop_job = {
index 78c8838f7cae8ba0a887b7cefbed1dbdb2f3f81d..39a2507b6f875b9b543608576d99b700ed04e2ec 100644 (file)
@@ -3229,13 +3229,10 @@ const UnitVTable service_vtable = {
                 .finished_start_job = {
                         [JOB_DONE]       = "Started %s.",
                         [JOB_FAILED]     = "Failed to start %s.",
-                        [JOB_DEPENDENCY] = "Dependency failed for %s.",
-                        [JOB_TIMEOUT]    = "Timed out starting %s.",
                 },
                 .finished_stop_job = {
                         [JOB_DONE]       = "Stopped %s.",
                         [JOB_FAILED]     = "Stopped (with error) %s.",
-                        [JOB_TIMEOUT]    = "Timed out stopping %s.",
                 },
         },
 };
index e52bf715154aa17d5baa93aa45a72c82d254f3d1..064eb5d93327b5cda413982c6dfb415a76fd5ff8 100644 (file)
@@ -297,7 +297,6 @@ const UnitVTable slice_vtable = {
         .status_message_formats = {
                 .finished_start_job = {
                         [JOB_DONE]       = "Created slice %s.",
-                        [JOB_DEPENDENCY] = "Dependency failed for %s.",
                 },
                 .finished_stop_job = {
                         [JOB_DONE]       = "Removed slice %s.",
index 693cbc60800b32f6145d2a6fa45cafeaa37efacc..87631f8753ac857db7929f73ef256aa2511d7430 100644 (file)
@@ -2722,7 +2722,6 @@ const UnitVTable socket_vtable = {
                 .finished_start_job = {
                         [JOB_DONE]       = "Listening on %s.",
                         [JOB_FAILED]     = "Failed to listen on %s.",
-                        [JOB_DEPENDENCY] = "Dependency failed for %s.",
                         [JOB_TIMEOUT]    = "Timed out starting %s.",
                 },
                 .finished_stop_job = {
index 193c8c37675811552620bf2f7c6c88c6b44991f4..0bc3827ff061542490cb474f0c38e538a506dbdf 100644 (file)
@@ -1505,7 +1505,6 @@ const UnitVTable swap_vtable = {
                 .finished_start_job = {
                         [JOB_DONE]       = "Activated swap %s.",
                         [JOB_FAILED]     = "Failed to activate swap %s.",
-                        [JOB_DEPENDENCY] = "Dependency failed for %s.",
                         [JOB_TIMEOUT]    = "Timed out activating swap %s.",
                 },
                 .finished_stop_job = {
index 8817ef21c4c61a3daba8d24b717e9a3c19f83406..b492a7c4c7f046c50d76f16ef18258f1eaabee27 100644 (file)
@@ -227,7 +227,6 @@ const UnitVTable target_vtable = {
         .status_message_formats = {
                 .finished_start_job = {
                         [JOB_DONE]       = "Reached target %s.",
-                        [JOB_DEPENDENCY] = "Dependency failed for %s.",
                 },
                 .finished_stop_job = {
                         [JOB_DONE]       = "Stopped target %s.",