[systemd-commits] 3 commits - Makefile.am src/dbus-execute.c src/dbus-execute.h src/execute.h

[Lennart Poettering]

 Makefile.am        |    5 +----
 src/dbus-execute.c |    2 +-
 src/dbus-execute.h |    2 +-
 src/execute.h      |    4 ++--
 4 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 835c60f50c861bce2c4bbcd35d51307a5443b5cf
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jun 15 15:54:50 2011 +0200

    build-sys: local-fs, remote-fs and swap are active anyway when user sessions are created, there is no point in having these units known in sessions

diff --git a/Makefile.am b/Makefile.am
index ded325a..7ca0ae8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -342,7 +342,6 @@ dist_userunit_DATA = \
 	units/user/exit.target
 
 nodist_userunit_DATA = \
-	units/user/remote-fs.target \
 	units/user/exit.service
 
 EXTRA_DIST = \
@@ -1387,11 +1386,9 @@ endif
 		$(LN_S) ../var-run.mount var-run.mount && \
 		$(LN_S) ../media.mount media.mount )
 	( cd $(DESTDIR)$(userunitdir) && \
-		rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target sound.target && \
+		rm -f shutdown.target sockets.target bluetooth.target printer.target sound.target && \
 		$(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
 		$(LN_S) $(systemunitdir)/sockets.target sockets.target && \
-		$(LN_S) $(systemunitdir)/local-fs.target local-fs.target && \
-		$(LN_S) $(systemunitdir)/swap.target swap.target && \
 		$(LN_S) $(systemunitdir)/bluetooth.target bluetooth.target && \
 		$(LN_S) $(systemunitdir)/printer.target printer.target && \
 		$(LN_S) $(systemunitdir)/sound.target sound.target )

commit 1365b53ff9a53c94c88bbf4ec5e5782edb75e663
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon May 23 21:37:45 2011 +0200

    execute: fix function prototype

diff --git a/src/execute.h b/src/execute.h
index 4ed79f0..55bae24 100644
--- a/src/execute.h
+++ b/src/execute.h
@@ -211,10 +211,10 @@ void exec_status_exit(ExecStatus *s, ExecContext *context, pid_t pid, int code,
 void exec_status_dump(ExecStatus *s, FILE *f, const char *prefix);
 
 const char* exec_output_to_string(ExecOutput i);
-int exec_output_from_string(const char *s);
+ExecOutput exec_output_from_string(const char *s);
 
 const char* exec_input_to_string(ExecInput i);
-int exec_input_from_string(const char *s);
+ExecInput exec_input_from_string(const char *s);
 
 const char *kill_mode_to_string(KillMode k);
 KillMode kill_mode_from_string(const char *s);

commit 7c3d67eff3e165b50084bf9c3269ec582d90c403
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jun 15 10:16:49 2011 +0200

    dbus: fix name of capability property

diff --git a/src/dbus-execute.c b/src/dbus-execute.c
index 3f8fafe..6ceffc5 100644
--- a/src/dbus-execute.c
+++ b/src/dbus-execute.c
@@ -235,7 +235,7 @@ int bus_execute_append_capability_bs(DBusMessageIter *i, const char *property, v
         assert(property);
         assert(c);
 
-        /* We store this negated internally, to match the kernel, bu
+        /* We store this negated internally, to match the kernel, but
          * we expose it normalized. */
 
         normal = *(uint64_t*) data;
diff --git a/src/dbus-execute.h b/src/dbus-execute.h
index 42df5aa..56c5bcd 100644
--- a/src/dbus-execute.h
+++ b/src/dbus-execute.h
@@ -77,7 +77,7 @@
         "  <property name=\"SyslogLevelPrefix\" type=\"b\" access=\"read\"/>\n" \
         "  <property name=\"Capabilities\" type=\"s\" access=\"read\"/>\n" \
         "  <property name=\"SecureBits\" type=\"i\" access=\"read\"/>\n" \
-        "  <property name=\"CapabilityBoundingSetDrop\" type=\"t\" access=\"read\"/>\n" \
+        "  <property name=\"CapabilityBoundingSet\" type=\"t\" access=\"read\"/>\n" \
         "  <property name=\"User\" type=\"s\" access=\"read\"/>\n"      \
         "  <property name=\"Group\" type=\"s\" access=\"read\"/>\n"     \
         "  <property name=\"SupplementaryGroups\" type=\"as\" access=\"read\"/>\n" \