Merge pull request #3049 from keszybz/preset-fixes

Fixes for preset-all handling and a few related issues

1 files changed, 8 insertions, 6 deletions

diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index 2392ed6c16..9a913a6c91 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -1565,11 +1565,13 @@ static int reply_unit_file_changes_and_free(
         unsigned i;
         int r;
 
-        if (n_changes > 0) {
-                r = bus_foreach_bus(m, NULL, send_unit_files_changed, NULL);
-                if (r < 0)
-                        log_debug_errno(r, "Failed to send UnitFilesChanged signal: %m");
-        }
+        for (i = 0; i < n_changes; i++)
+                if (unit_file_change_is_modification(changes[i].type)) {
+                        r = bus_foreach_bus(m, NULL, send_unit_files_changed, NULL);
+                        if (r < 0)
+                                log_debug_errno(r, "Failed to send UnitFilesChanged signal: %m");
+                        break;
+                }
 
         r = sd_bus_message_new_method_return(message, &reply);
         if (r < 0)
@@ -1610,7 +1612,7 @@ fail:
 static int install_error(sd_bus_error *error, int c) {
         assert(c < 0);
 
-        if (c == -ESHUTDOWN)
+        if (c == -ERFKILL)
                 return sd_bus_error_setf(error, BUS_ERROR_UNIT_MASKED, "Unit file is masked.");
         if (c == -EADDRNOTAVAIL)
                 return sd_bus_error_setf(error, BUS_ERROR_UNIT_GENERATED, "Unit file is transient or generated.");