nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 08:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

systemd: Fix a systemd crash when doing "systemctl list-unit-files"

Browse Source
This commit is contained in:
Eelco Dolstra 2012-10-31 13:44:31 +01:00
parent ccd44e84c8
commit 094c1fd108
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/os-specific/linux/systemd/default.nix
View File

@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
[ ./reexec.patch
./ignore-duplicates.patch
./crypt-devices-are-ready.patch
./listunitfiles-abort.patch
];
buildInputs =

20
pkgs/os-specific/linux/systemd/listunitfiles-abort.patch Normal file
View File

@ -0,0 +1,20 @@
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index ed9784b..6d045cc 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -491,7 +491,6 @@ static DBusMessage *message_from_file_changes(
return reply;
oom:
- dbus_message_unref(reply);
return NULL;
}
@@ -1432,7 +1431,6 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
r = unit_file_get_list(m->running_as == SYSTEMD_SYSTEM ? UNIT_FILE_SYSTEM : UNIT_FILE_USER, NULL, h);
if (r < 0) {
unit_file_list_free(h);
- dbus_message_unref(reply);
return bus_send_error_reply(connection, message, NULL, r);
}