[systemd-commits] 2 commits - src/dbus-execute.c units/systemd-ask-password-plymouth.path units/systemd-ask-password-plymouth.service.in

[Lennart Poettering]

 src/dbus-execute.c                             |    7 +++++--
 units/systemd-ask-password-plymouth.path       |    1 +
 units/systemd-ask-password-plymouth.service.in |    1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 8e4fb44ab0f853ff8faedcaa2cbc58b80eda9611
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Aug 29 19:45:22 2011 +0200

    plymouth: don't enable ask-password agent of plymouth is disabled

diff --git a/units/systemd-ask-password-plymouth.path b/units/systemd-ask-password-plymouth.path
index 6a96520..ba592c7 100644
--- a/units/systemd-ask-password-plymouth.path
+++ b/units/systemd-ask-password-plymouth.path
@@ -10,6 +10,7 @@ Description=Forward Password Requests to Plymouth Directory Watch
 DefaultDependencies=no
 Conflicts=shutdown.target systemd-ask-password-console.path systemd-ask-password-console.service
 Before=basic.target shutdown.target
+ConditionKernelCommandLine=!plymouth.enable=0
 
 [Path]
 DirectoryNotEmpty=/run/systemd/ask-password
diff --git a/units/systemd-ask-password-plymouth.service.in b/units/systemd-ask-password-plymouth.service.in
index a7cd451..2e071bd 100644
--- a/units/systemd-ask-password-plymouth.service.in
+++ b/units/systemd-ask-password-plymouth.service.in
@@ -10,6 +10,7 @@ Description=Forward Password Requests to Plymouth
 DefaultDependencies=no
 Conflicts=shutdown.target systemd-ask-password-console.path systemd-ask-password-console.service
 Before=shutdown.target
+ConditionKernelCommandLine=!plymouth.enable=0
 
 [Service]
 ExecStart=@rootbindir@/systemd-tty-ask-password-agent --watch --plymouth

commit 7daa9e6e29b546275566084512ea4e547bc79b91
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Aug 29 19:44:52 2011 +0200

    execute: fix bus serialization for commands

diff --git a/src/dbus-execute.c b/src/dbus-execute.c
index 6ceffc5..201f6b5 100644
--- a/src/dbus-execute.c
+++ b/src/dbus-execute.c
@@ -308,13 +308,14 @@ int bus_execute_append_command(DBusMessageIter *i, const char *property, void *d
         assert(i);
         assert(property);
 
-        if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "(sasbttuii)", &sub))
+        if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "(sasbttttuii)", &sub))
                 return -ENOMEM;
 
         LIST_FOREACH(command, c, c) {
                 char **l;
                 uint32_t pid;
                 int32_t code, status;
+                dbus_bool_t b;
 
                 if (!c->path)
                         continue;
@@ -332,8 +333,10 @@ int bus_execute_append_command(DBusMessageIter *i, const char *property, void *d
                 code = (int32_t) c->exec_status.code;
                 status = (int32_t) c->exec_status.status;
 
+                b = !!c->ignore;
+
                 if (!dbus_message_iter_close_container(&sub2, &sub3) ||
-                    !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_BOOLEAN, &c->ignore) ||
+                    !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_BOOLEAN, &b) ||
                     !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_UINT64, &c->exec_status.start_timestamp.realtime) ||
                     !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_UINT64, &c->exec_status.start_timestamp.monotonic) ||
                     !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_UINT64, &c->exec_status.exit_timestamp.realtime) ||