bus-unit-util: ReloadSignal is a Service property

Follow-up for c133545430897ece77a2066bc740c4a8f7b781e5

diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c
index 0a153c29939da635967e42b9112f4476841b8bf9..98ccc7cf2d748e496351a5ab5505c5ea432305d4 100644 (file)
--- a/src/shared/bus-unit-util.c
+++ b/src/shared/bus-unit-util.c
@@ -2564,7 +2564,6 @@ static const BusProperty kill_properties[] = {
         { "RestartKillSignal",                     bus_append_signal_from_string                 },
         { "FinalKillSignal",                       bus_append_signal_from_string                 },
         { "WatchdogSignal",                        bus_append_signal_from_string                 },
-        { "ReloadSignal",                          bus_append_signal_from_string                 },
         {}
 };
 
@@ -2659,6 +2658,7 @@ static const BusProperty service_properties[] = {
         { "RestartForceExitStatus",                bus_append_exit_status                        },
         { "SuccessExitStatus",                     bus_append_exit_status                        },
         { "OpenFile",                              bus_append_open_file                          },
+        { "ReloadSignal",                          bus_append_signal_from_string                 },
         {}
 };
 

diff --git a/src/test/test-bus-unit-util.c b/src/test/test-bus-unit-util.c
index d713a52b814af6d66a4b20410ff8ba231c8aa469..7b0aa84463c91d7d0c3cff6ecc3de24454b7cac4 100644 (file)
--- a/src/test/test-bus-unit-util.c
+++ b/src/test/test-bus-unit-util.c
@@ -593,11 +593,7 @@ TEST(kill_properties) {
                         "FinalKillSignal=SIGWINCH",
                         "FinalKillSignal=2",
                         "WatchdogSignal=RTMIN",
-                        "WatchdogSignal=RTMIN+0",
-                        "ReloadSignal=RTMAX",
-                        "ReloadSignal=RTMAX-0",
-                        "ReloadSignal=RTMAX-5",
-                        "-ERANGE ReloadSignal=RTMAX-100"
+                        "WatchdogSignal=RTMIN+0"
         );
 
         test_transient_settings_one(UNIT_SCOPE, lines);
@@ -782,7 +778,12 @@ TEST(service_properties) {
                         "OpenFile=/etc/myservice.conf:SOME$NAME:graceful",
                         "OpenFile=/etc/myservice.conf::read-only,graceful",
                         "OpenFile=/etc/myservice.conf::truncate,graceful",
-                        "-EINVAL OpenFile=/etc/myservice.conf::append,truncate,read-only,graceful"
+                        "-EINVAL OpenFile=/etc/myservice.conf::append,truncate,read-only,graceful",
+
+                        "ReloadSignal=RTMAX",
+                        "ReloadSignal=RTMAX-0",
+                        "ReloadSignal=RTMAX-5",
+                        "-ERANGE ReloadSignal=RTMAX-100"
         );
 
         test_transient_settings_one(UNIT_SERVICE, lines);